From cf11d1070edc5cf2fabdc4368fb1653a47d4ba6a Mon Sep 17 00:00:00 2001
From: Chandler Prall <chandler.prall@gmail.com>
Date: Thu, 15 Oct 2020 14:30:40 -0600
Subject: [PATCH 1/5] Upgraded eui to v29.5.0; snapshot updates

---
 package.json                                  |   2 +-
 packages/kbn-ui-framework/package.json        |   2 +-
 packages/kbn-ui-shared-deps/package.json      |   2 +-
 .../collapsible_nav.test.tsx.snap             |  36 +-
 .../header/__snapshots__/header.test.tsx.snap |   2 +-
 .../flyout_service.test.tsx.snap              |   4 +-
 .../__snapshots__/modal_service.test.tsx.snap |   6 +-
 .../dashboard_empty_screen.test.tsx.snap      |   2 +-
 .../__snapshots__/no_results.test.js.snap     |   4 +-
 .../__snapshots__/field_name.test.tsx.snap    |   6 +-
 .../saved_objects_installer.test.js.snap      |   2 +-
 .../table/__snapshots__/table.test.tsx.snap   |   2 +-
 .../url/__snapshots__/url.test.tsx.snap       |   6 +-
 .../warning_call_out.test.tsx.snap            |   6 +-
 .../inspector_panel.test.tsx.snap             |   2 +-
 .../exit_full_screen_button.test.tsx.snap     |   4 +-
 .../__snapshots__/split_panel.test.tsx.snap   |   2 +-
 .../__snapshots__/header.test.tsx.snap        |   4 +-
 .../__snapshots__/intro.test.tsx.snap         |   2 +-
 .../not_found_errors.test.tsx.snap            |   8 +-
 .../legend/__snapshots__/legend.test.tsx.snap |   4 +-
 .../visualization_noresults.test.js.snap      |   2 +-
 .../visualization_requesterror.test.js.snap   |   2 +-
 .../__snapshots__/new_vis_modal.test.tsx.snap |  64 ++--
 .../plugins/kbn_tp_run_pipeline/package.json  |   2 +-
 .../kbn_sample_panel_action/package.json      |   2 +-
 .../kbn_tp_custom_visualizations/package.json |   2 +-
 x-pack/package.json                           |   2 +-
 .../__test__/__snapshots__/List.test.tsx.snap |  24 +-
 .../service_overview.test.tsx.snap            |  14 +-
 .../TransactionActionMenu.test.tsx.snap       |   2 +-
 .../dropdown_filter.stories.storyshot         |  10 +-
 .../time_filter.stories.storyshot             |  20 +-
 .../__snapshots__/palette.stories.storyshot   |   2 +-
 .../extended_template.stories.storyshot       |   4 +-
 .../date_format.stories.storyshot             |   6 +-
 .../number_format.stories.storyshot           |   6 +-
 .../__snapshots__/asset.stories.storyshot     |  16 +-
 .../asset_manager.stories.storyshot           |  26 +-
 .../__snapshots__/color_dot.stories.storyshot |   8 +-
 .../color_manager.stories.storyshot           |  16 +-
 .../color_palette.stories.storyshot           |   6 +-
 .../color_picker.stories.storyshot            |  20 +-
 .../custom_element_modal.stories.storyshot    |  22 +-
 .../datasource_component.stories.storyshot    |   8 +-
 .../element_card.stories.storyshot            |   6 +-
 .../file_upload.stories.storyshot             |   2 +-
 .../font_picker.stories.storyshot             |   4 +-
 .../__snapshots__/item_grid.stories.storyshot |  12 +-
 .../keyboard_shortcuts_doc.stories.storyshot  |   2 +-
 .../palette_picker.stories.storyshot          |   6 +-
 .../element_controls.stories.storyshot        |   4 +-
 .../element_grid.stories.storyshot            |  12 +-
 .../saved_elements_modal.stories.storyshot    |  36 +-
 .../sidebar_header.stories.storyshot          |   8 +-
 .../__snapshots__/tag.stories.storyshot       |   4 +-
 .../__snapshots__/tag_list.stories.storyshot  |   6 +-
 .../text_style_picker.stories.storyshot       |  32 +-
 .../__snapshots__/toolbar.stories.storyshot   |  14 +-
 .../delete_var.stories.storyshot              |   4 +-
 .../__snapshots__/edit_var.stories.storyshot  |  46 +--
 .../var_config.stories.storyshot              |   4 +-
 .../element_menu.stories.storyshot            |   2 +-
 .../__snapshots__/pdf_panel.stories.storyshot |   2 +-
 .../workpad_templates.stories.storyshot       |  22 +-
 .../extended_template.stories.storyshot       |  18 +-
 .../extended_template.stories.storyshot       |   8 +-
 .../simple_template.stories.storyshot         |   2 +-
 .../__snapshots__/shareable.test.tsx.snap     |  10 +-
 .../__snapshots__/canvas.stories.storyshot    |  24 +-
 .../__tests__/__snapshots__/app.test.tsx.snap |   2 +-
 .../__snapshots__/footer.stories.storyshot    |  16 +-
 .../page_controls.stories.storyshot           |  12 +-
 .../__snapshots__/title.stories.storyshot     |   6 +-
 .../autoplay_settings.stories.storyshot       |  12 +-
 .../__snapshots__/settings.stories.storyshot  |   4 +-
 .../toolbar_settings.stories.storyshot        |  12 +-
 .../__snapshots__/settings.test.tsx.snap      |  46 +--
 .../__snapshots__/search_bar.test.tsx.snap    |   2 +-
 .../extend_index_management.test.tsx.snap     |   2 +-
 .../__snapshots__/policy_table.test.tsx.snap  |   4 +-
 .../__snapshots__/license_status.test.js.snap |   4 +-
 .../upload_license.test.tsx.snap              |  14 +-
 .../upgrade_failure.test.js.snap              |   6 +-
 .../tiled_vector_layer.test.tsx.snap          |   2 +-
 .../__snapshots__/cells.test.js.snap          |   4 +-
 .../__snapshots__/no_data.test.js.snap        |   4 +-
 .../__snapshots__/summary_status.test.js.snap |  30 +-
 .../remote_cluster_form.test.js.snap          |  24 +-
 .../report_info_button.test.tsx.snap          |  10 +-
 .../overwritten_session_page.test.tsx.snap    |   2 +-
 .../api_keys_grid_page.test.tsx.snap          |   4 +-
 .../roles_grid_page.test.tsx.snap             |   2 +-
 .../reset_session_page.test.tsx.snap          |   2 +-
 .../connectors_dropdown.test.tsx              |   2 +-
 .../trusted_app_deletion_dialog.test.tsx.snap |   6 +-
 .../__snapshots__/index.test.tsx.snap         |  22 +-
 .../__snapshots__/index.test.tsx.snap         | 348 +++++++++---------
 .../__snapshots__/cert_search.test.tsx.snap   |   4 +-
 .../__snapshots__/cert_status.test.tsx.snap   |   2 +-
 .../fingerprint_col.test.tsx.snap             |   4 +-
 .../uptime_date_picker.test.tsx.snap          |   6 +-
 .../__snapshots__/donut_chart.test.tsx.snap   |  10 +-
 .../__snapshots__/license_info.test.tsx.snap  |   2 +-
 .../__snapshots__/ml_flyout.test.tsx.snap     |   4 +-
 .../__snapshots__/expanded_row.test.tsx.snap  |   2 +-
 .../monitor_status.bar.test.tsx.snap          |   2 +-
 .../ssl_certificate.test.tsx.snap             |   2 +-
 .../location_status_tags.test.tsx.snap        |   4 +-
 .../location_missing.test.tsx.snap            |   2 +-
 .../__snapshots__/empty_state.test.tsx.snap   |   8 +-
 .../filter_popover.test.tsx.snap              |   2 +-
 .../__snapshots__/monitor_list.test.tsx.snap  |  18 +-
 .../monitor_list_status_column.test.tsx.snap  |   2 +-
 .../__snapshots__/page_header.test.tsx.snap   |  24 +-
 yarn.lock                                     |   8 +-
 116 files changed, 696 insertions(+), 698 deletions(-)

diff --git a/package.json b/package.json
index 8a87598aec56d..b965f50cd468c 100644
--- a/package.json
+++ b/package.json
@@ -117,7 +117,7 @@
   "dependencies": {
     "@elastic/datemath": "5.0.3",
     "@elastic/elasticsearch": "7.9.1",
-    "@elastic/eui": "29.3.0",
+    "@elastic/eui": "29.5.0",
     "@elastic/good": "8.1.1-kibana2",
     "@elastic/numeral": "^2.5.0",
     "@elastic/request-crypto": "1.1.4",
diff --git a/packages/kbn-ui-framework/package.json b/packages/kbn-ui-framework/package.json
index 21d25311420ca..d954ae0823caf 100644
--- a/packages/kbn-ui-framework/package.json
+++ b/packages/kbn-ui-framework/package.json
@@ -31,7 +31,7 @@
   },
   "devDependencies": {
     "@babel/core": "^7.11.6",
-    "@elastic/eui": "29.3.0",
+    "@elastic/eui": "29.5.0",
     "@kbn/babel-preset": "1.0.0",
     "@kbn/optimizer": "1.0.0",
     "babel-loader": "^8.0.6",
diff --git a/packages/kbn-ui-shared-deps/package.json b/packages/kbn-ui-shared-deps/package.json
index 0a154c537fec1..980d9d02317b6 100644
--- a/packages/kbn-ui-shared-deps/package.json
+++ b/packages/kbn-ui-shared-deps/package.json
@@ -10,7 +10,7 @@
   },
   "dependencies": {
     "@elastic/charts": "23.2.1",
-    "@elastic/eui": "29.3.0",
+    "@elastic/eui": "29.5.0",
     "@elastic/numeral": "^2.5.0",
     "@kbn/i18n": "1.0.0",
     "@kbn/monaco": "1.0.0",
diff --git a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
index 47b8aaefaf86a..cf734f33cc3e4 100644
--- a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
+++ b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
@@ -585,7 +585,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                                 className="euiListGroupItem__icon"
                                 type="home"
                               >
-                                <div
+                                <span
                                   className="euiListGroupItem__icon"
                                   data-euiicon-type="home"
                                 />
@@ -671,7 +671,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                         size="m"
                         type="arrowRight"
                       >
-                        <div
+                        <span
                           className="euiAccordion__icon euiAccordion__icon-isOpen"
                           data-euiicon-type="arrowRight"
                           size="m"
@@ -925,7 +925,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                             size="m"
                             type="arrowRight"
                           >
-                            <div
+                            <span
                               className="euiAccordion__icon euiAccordion__icon-isOpen"
                               data-euiicon-type="arrowRight"
                               size="m"
@@ -953,7 +953,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                                     size="l"
                                     type="logoKibana"
                                   >
-                                    <div
+                                    <span
                                       data-euiicon-type="logoKibana"
                                       size="l"
                                     />
@@ -1215,7 +1215,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                             size="m"
                             type="arrowRight"
                           >
-                            <div
+                            <span
                               className="euiAccordion__icon euiAccordion__icon-isOpen"
                               data-euiicon-type="arrowRight"
                               size="m"
@@ -1243,7 +1243,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                                     size="l"
                                     type="logoObservability"
                                   >
-                                    <div
+                                    <span
                                       data-euiicon-type="logoObservability"
                                       size="l"
                                     />
@@ -1466,7 +1466,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                             size="m"
                             type="arrowRight"
                           >
-                            <div
+                            <span
                               className="euiAccordion__icon euiAccordion__icon-isOpen"
                               data-euiicon-type="arrowRight"
                               size="m"
@@ -1494,7 +1494,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                                     size="l"
                                     type="logoSecurity"
                                   >
-                                    <div
+                                    <span
                                       data-euiicon-type="logoSecurity"
                                       size="l"
                                     />
@@ -1678,7 +1678,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                             size="m"
                             type="arrowRight"
                           >
-                            <div
+                            <span
                               className="euiAccordion__icon euiAccordion__icon-isOpen"
                               data-euiicon-type="arrowRight"
                               size="m"
@@ -1706,7 +1706,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                                     size="l"
                                     type="managementApp"
                                   >
-                                    <div
+                                    <span
                                       data-euiicon-type="managementApp"
                                       size="l"
                                     />
@@ -1900,7 +1900,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                                   data-test-subj="collapsible-nav-lock"
                                   type="button"
                                 >
-                                  <div
+                                  <span
                                     class="euiListGroupItem__icon"
                                     data-euiicon-type="lockOpen"
                                   />
@@ -1935,7 +1935,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                                   className="euiListGroupItem__icon"
                                   type="lockOpen"
                                 >
-                                  <div
+                                  <span
                                     className="euiListGroupItem__icon"
                                     data-euiicon-type="lockOpen"
                                   />
@@ -1994,7 +1994,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                       size="m"
                       type="cross"
                     >
-                      <div
+                      <span
                         className="euiButtonContent__icon"
                         data-euiicon-type="cross"
                         size="m"
@@ -2830,7 +2830,7 @@ exports[`CollapsibleNav renders the default nav 3`] = `
                                 className="euiListGroupItem__icon"
                                 type="home"
                               >
-                                <div
+                                <span
                                   className="euiListGroupItem__icon"
                                   data-euiicon-type="home"
                                 />
@@ -2916,7 +2916,7 @@ exports[`CollapsibleNav renders the default nav 3`] = `
                         size="m"
                         type="arrowRight"
                       >
-                        <div
+                        <span
                           className="euiAccordion__icon euiAccordion__icon-isOpen"
                           data-euiicon-type="arrowRight"
                           size="m"
@@ -3053,7 +3053,7 @@ exports[`CollapsibleNav renders the default nav 3`] = `
                                   data-test-subj="collapsible-nav-lock"
                                   type="button"
                                 >
-                                  <div
+                                  <span
                                     class="euiListGroupItem__icon"
                                     data-euiicon-type="lock"
                                   />
@@ -3088,7 +3088,7 @@ exports[`CollapsibleNav renders the default nav 3`] = `
                                   className="euiListGroupItem__icon"
                                   type="lock"
                                 >
-                                  <div
+                                  <span
                                     className="euiListGroupItem__icon"
                                     data-euiicon-type="lock"
                                   />
@@ -3147,7 +3147,7 @@ exports[`CollapsibleNav renders the default nav 3`] = `
                       size="m"
                       type="cross"
                     >
-                      <div
+                      <span
                         className="euiButtonContent__icon"
                         data-euiicon-type="cross"
                         size="m"
diff --git a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
index 5e563c4061093..97e9ffa42fc88 100644
--- a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
+++ b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
@@ -6096,7 +6096,7 @@ exports[`Header renders 1`] = `
                           size="m"
                           type="cross"
                         >
-                          <div
+                          <span
                             className="euiButtonContent__icon"
                             data-euiicon-type="cross"
                             size="m"
diff --git a/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap b/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap
index a5c1d46f74709..0ade5bfe25307 100644
--- a/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap
+++ b/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap
@@ -26,7 +26,7 @@ Array [
 ]
 `;
 
-exports[`FlyoutService openFlyout() renders a flyout to the DOM 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div role=\\"dialog\\" class=\\"euiFlyout euiFlyout--medium\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiFlyout__closeButton\\" type=\\"button\\" aria-label=\\"Close this dialog\\" data-test-subj=\\"euiFlyoutCloseButton\\"><div data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button><div class=\\"kbnOverlayMountWrapper\\"><span>Flyout content</span></div></div></div>"`;
+exports[`FlyoutService openFlyout() renders a flyout to the DOM 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div role=\\"dialog\\" class=\\"euiFlyout euiFlyout--medium\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiFlyout__closeButton\\" type=\\"button\\" aria-label=\\"Close this dialog\\" data-test-subj=\\"euiFlyoutCloseButton\\"><span data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button><div class=\\"kbnOverlayMountWrapper\\"><span>Flyout content</span></div></div></div>"`;
 
 exports[`FlyoutService openFlyout() with a currently active flyout replaces the current flyout with a new one 1`] = `
 Array [
@@ -59,4 +59,4 @@ Array [
 ]
 `;
 
-exports[`FlyoutService openFlyout() with a currently active flyout replaces the current flyout with a new one 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div role=\\"dialog\\" class=\\"euiFlyout euiFlyout--medium\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiFlyout__closeButton\\" type=\\"button\\" aria-label=\\"Close this dialog\\" data-test-subj=\\"euiFlyoutCloseButton\\"><div data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button><div class=\\"kbnOverlayMountWrapper\\"><span>Flyout content 2</span></div></div></div>"`;
+exports[`FlyoutService openFlyout() with a currently active flyout replaces the current flyout with a new one 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div role=\\"dialog\\" class=\\"euiFlyout euiFlyout--medium\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiFlyout__closeButton\\" type=\\"button\\" aria-label=\\"Close this dialog\\" data-test-subj=\\"euiFlyoutCloseButton\\"><span data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button><div class=\\"kbnOverlayMountWrapper\\"><span>Flyout content 2</span></div></div></div>"`;
diff --git a/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap b/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap
index aea52eb8e7ab7..7e79725c20307 100644
--- a/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap
+++ b/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap
@@ -31,7 +31,7 @@ Array [
 ]
 `;
 
-exports[`ModalService openConfirm() renders a mountpoint confirm message 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div class=\\"euiModal euiModal--maxWidth-default euiModal--confirmation\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiModal__closeIcon\\" type=\\"button\\" aria-label=\\"Closes this modal window\\"><div data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button><div class=\\"euiModal__flex\\"><div class=\\"euiModalBody\\"><div class=\\"euiModalBody__overflow\\"><div class=\\"euiText euiText--medium\\" data-test-subj=\\"confirmModalBodyText\\"><div class=\\"kbnOverlayMountWrapper\\"><span>Modal content</span></div></div></div></div><div class=\\"euiModalFooter\\"><button class=\\"euiButtonEmpty euiButtonEmpty--primary\\" type=\\"button\\" data-test-subj=\\"confirmModalCancelButton\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\">Cancel</span></span></button><button class=\\"euiButton euiButton--primary euiButton--fill\\" type=\\"button\\" data-test-subj=\\"confirmModalConfirmButton\\"><span class=\\"euiButtonContent euiButton__content\\"><span class=\\"euiButton__text\\">Confirm</span></span></button></div></div></div></div>"`;
+exports[`ModalService openConfirm() renders a mountpoint confirm message 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div class=\\"euiModal euiModal--maxWidth-default euiModal--confirmation\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiModal__closeIcon\\" type=\\"button\\" aria-label=\\"Closes this modal window\\"><span data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button><div class=\\"euiModal__flex\\"><div class=\\"euiModalBody\\"><div class=\\"euiModalBody__overflow\\"><div class=\\"euiText euiText--medium\\" data-test-subj=\\"confirmModalBodyText\\"><div class=\\"kbnOverlayMountWrapper\\"><span>Modal content</span></div></div></div></div><div class=\\"euiModalFooter\\"><button class=\\"euiButtonEmpty euiButtonEmpty--primary\\" type=\\"button\\" data-test-subj=\\"confirmModalCancelButton\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\">Cancel</span></span></button><button class=\\"euiButton euiButton--primary euiButton--fill\\" type=\\"button\\" data-test-subj=\\"confirmModalConfirmButton\\"><span class=\\"euiButtonContent euiButton__content\\"><span class=\\"euiButton__text\\">Confirm</span></span></button></div></div></div></div>"`;
 
 exports[`ModalService openConfirm() renders a string confirm message 1`] = `
 Array [
@@ -53,7 +53,7 @@ Array [
 ]
 `;
 
-exports[`ModalService openConfirm() renders a string confirm message 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div class=\\"euiModal euiModal--maxWidth-default euiModal--confirmation\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiModal__closeIcon\\" type=\\"button\\" aria-label=\\"Closes this modal window\\"><div data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button><div class=\\"euiModal__flex\\"><div class=\\"euiModalBody\\"><div class=\\"euiModalBody__overflow\\"><div class=\\"euiText euiText--medium\\" data-test-subj=\\"confirmModalBodyText\\"><p>Some message</p></div></div></div><div class=\\"euiModalFooter\\"><button class=\\"euiButtonEmpty euiButtonEmpty--primary\\" type=\\"button\\" data-test-subj=\\"confirmModalCancelButton\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\">Cancel</span></span></button><button class=\\"euiButton euiButton--primary euiButton--fill\\" type=\\"button\\" data-test-subj=\\"confirmModalConfirmButton\\"><span class=\\"euiButtonContent euiButton__content\\"><span class=\\"euiButton__text\\">Confirm</span></span></button></div></div></div></div>"`;
+exports[`ModalService openConfirm() renders a string confirm message 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div class=\\"euiModal euiModal--maxWidth-default euiModal--confirmation\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiModal__closeIcon\\" type=\\"button\\" aria-label=\\"Closes this modal window\\"><span data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button><div class=\\"euiModal__flex\\"><div class=\\"euiModalBody\\"><div class=\\"euiModalBody__overflow\\"><div class=\\"euiText euiText--medium\\" data-test-subj=\\"confirmModalBodyText\\"><p>Some message</p></div></div></div><div class=\\"euiModalFooter\\"><button class=\\"euiButtonEmpty euiButtonEmpty--primary\\" type=\\"button\\" data-test-subj=\\"confirmModalCancelButton\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\">Cancel</span></span></button><button class=\\"euiButton euiButton--primary euiButton--fill\\" type=\\"button\\" data-test-subj=\\"confirmModalConfirmButton\\"><span class=\\"euiButtonContent euiButton__content\\"><span class=\\"euiButton__text\\">Confirm</span></span></button></div></div></div></div>"`;
 
 exports[`ModalService openConfirm() with a currently active confirm replaces the current confirm with the new one 1`] = `
 Array [
@@ -145,7 +145,7 @@ Array [
 ]
 `;
 
-exports[`ModalService openModal() renders a modal to the DOM 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div class=\\"euiModal euiModal--maxWidth-default\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiModal__closeIcon\\" type=\\"button\\" aria-label=\\"Closes this modal window\\"><div data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button><div class=\\"euiModal__flex\\"><div class=\\"kbnOverlayMountWrapper\\"><span>Modal content</span></div></div></div></div>"`;
+exports[`ModalService openModal() renders a modal to the DOM 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div class=\\"euiModal euiModal--maxWidth-default\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiModal__closeIcon\\" type=\\"button\\" aria-label=\\"Closes this modal window\\"><span data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button><div class=\\"euiModal__flex\\"><div class=\\"kbnOverlayMountWrapper\\"><span>Modal content</span></div></div></div></div>"`;
 
 exports[`ModalService openModal() with a currently active confirm replaces the current confirm with the new one 1`] = `
 Array [
diff --git a/src/plugins/dashboard/public/application/__snapshots__/dashboard_empty_screen.test.tsx.snap b/src/plugins/dashboard/public/application/__snapshots__/dashboard_empty_screen.test.tsx.snap
index 201c6e83a4a44..d523bd2ea5b52 100644
--- a/src/plugins/dashboard/public/application/__snapshots__/dashboard_empty_screen.test.tsx.snap
+++ b/src/plugins/dashboard/public/application/__snapshots__/dashboard_empty_screen.test.tsx.snap
@@ -704,7 +704,7 @@ exports[`DashboardEmptyScreen renders correctly with visualize paragraph 1`] = `
                         size="m"
                         type="plusInCircle"
                       >
-                        <div
+                        <span
                           className="euiButtonContent__icon"
                           data-euiicon-type="plusInCircle"
                           size="m"
diff --git a/src/plugins/discover/public/application/angular/directives/__snapshots__/no_results.test.js.snap b/src/plugins/discover/public/application/angular/directives/__snapshots__/no_results.test.js.snap
index e69e10e29e801..2fcc0853f2486 100644
--- a/src/plugins/discover/public/application/angular/directives/__snapshots__/no_results.test.js.snap
+++ b/src/plugins/discover/public/application/angular/directives/__snapshots__/no_results.test.js.snap
@@ -18,7 +18,7 @@ Array [
         <div
           class="euiCallOutHeader"
         >
-          <div
+          <span
             aria-hidden="true"
             class="euiCallOutHeader__icon"
             data-euiicon-type="help"
@@ -185,7 +185,7 @@ Array [
         <div
           class="euiCallOutHeader"
         >
-          <div
+          <span
             aria-hidden="true"
             class="euiCallOutHeader__icon"
             data-euiicon-type="help"
diff --git a/src/plugins/discover/public/application/components/field_name/__snapshots__/field_name.test.tsx.snap b/src/plugins/discover/public/application/components/field_name/__snapshots__/field_name.test.tsx.snap
index afb541253d994..d00a956b7c73d 100644
--- a/src/plugins/discover/public/application/components/field_name/__snapshots__/field_name.test.tsx.snap
+++ b/src/plugins/discover/public/application/components/field_name/__snapshots__/field_name.test.tsx.snap
@@ -10,7 +10,7 @@ exports[`FieldName renders a geo field, useShortDots is set to true 1`] = `
     <span
       class="euiToken euiToken--euiColorVis5 euiToken--square euiToken--light euiToken--small kbnFieldIcon"
     >
-      <div
+      <span
         aria-label="Geo point field"
         data-euiicon-type="tokenGeo"
         title="Geo point field"
@@ -41,7 +41,7 @@ exports[`FieldName renders a number field by providing a field record, useShortD
     <span
       class="euiToken euiToken--euiColorVis0 euiToken--square euiToken--light euiToken--small kbnFieldIcon"
     >
-      <div
+      <span
         aria-label="Number field"
         data-euiicon-type="tokenNumber"
         title="Number field"
@@ -72,7 +72,7 @@ exports[`FieldName renders a string field by providing fieldType and fieldName 1
     <span
       class="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--small kbnFieldIcon"
     >
-      <div
+      <span
         aria-label="String field"
         data-euiicon-type="tokenString"
         title="String field"
diff --git a/src/plugins/home/public/application/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap b/src/plugins/home/public/application/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap
index 9a9e055d54d2f..9992fe2c8cf5f 100644
--- a/src/plugins/home/public/application/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap
+++ b/src/plugins/home/public/application/components/tutorial/__snapshots__/saved_objects_installer.test.js.snap
@@ -526,7 +526,7 @@ exports[`bulkCreate should display success message when bulkCreate is successful
                       size="m"
                       type="check"
                     >
-                      <div
+                      <span
                         aria-label="complete"
                         className="euiStepNumber__icon"
                         data-euiicon-type="check"
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/components/table/__snapshots__/table.test.tsx.snap b/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/components/table/__snapshots__/table.test.tsx.snap
index 2d51b1722cfb2..2548e7e829789 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/components/table/__snapshots__/table.test.tsx.snap
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/indexed_fields_table/components/table/__snapshots__/table.test.tsx.snap
@@ -143,7 +143,7 @@ exports[`Table should render normally 1`] = `
 exports[`Table should render the boolean template (false) 1`] = `<span />`;
 
 exports[`Table should render the boolean template (true) 1`] = `
-<div
+<span
   aria-label="Is searchable"
   color="secondary"
   data-euiicon-type="dot"
diff --git a/src/plugins/index_pattern_management/public/components/field_editor/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap b/src/plugins/index_pattern_management/public/components/field_editor/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap
index 13be0353e1640..b627dbe0576ee 100644
--- a/src/plugins/index_pattern_management/public/components/field_editor/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap
+++ b/src/plugins/index_pattern_management/public/components/field_editor/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap
@@ -54,7 +54,7 @@ exports[`UrlFormatEditor should render normally 1`] = `
             <span
               class="euiFormControlLayoutCustomIcon"
             >
-              <div
+              <span
                 aria-hidden="true"
                 class="euiFormControlLayoutCustomIcon__icon"
                 data-euiicon-type="arrowDown"
@@ -104,11 +104,11 @@ exports[`UrlFormatEditor should render normally 1`] = `
             <span
               class="euiSwitch__track"
             >
-              <div
+              <span
                 class="euiSwitch__icon"
                 data-euiicon-type="cross"
               />
-              <div
+              <span
                 class="euiSwitch__icon euiSwitch__icon--checked"
                 data-euiicon-type="check"
               />
diff --git a/src/plugins/index_pattern_management/public/components/field_editor/components/scripting_call_outs/__snapshots__/warning_call_out.test.tsx.snap b/src/plugins/index_pattern_management/public/components/field_editor/components/scripting_call_outs/__snapshots__/warning_call_out.test.tsx.snap
index a01850a62101c..295c239f030db 100644
--- a/src/plugins/index_pattern_management/public/components/field_editor/components/scripting_call_outs/__snapshots__/warning_call_out.test.tsx.snap
+++ b/src/plugins/index_pattern_management/public/components/field_editor/components/scripting_call_outs/__snapshots__/warning_call_out.test.tsx.snap
@@ -27,7 +27,7 @@ exports[`ScriptingWarningCallOut should render normally 1`] = `
           size="m"
           type="alert"
         >
-          <div
+          <span
             aria-hidden="true"
             className="euiCallOutHeader__icon"
             data-euiicon-type="alert"
@@ -111,7 +111,7 @@ exports[`ScriptingWarningCallOut should render normally 1`] = `
                     <EuiIcon
                       type="link"
                     >
-                      <div
+                      <span
                         data-euiicon-type="link"
                       />
                     </EuiIcon>
@@ -138,7 +138,7 @@ exports[`ScriptingWarningCallOut should render normally 1`] = `
                     <EuiIcon
                       type="link"
                     >
-                      <div
+                      <span
                         data-euiicon-type="link"
                       />
                     </EuiIcon>
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 eaf0e5538f362..709c0bfe69f0b 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
@@ -279,7 +279,7 @@ exports[`InspectorPanel should render as expected 1`] = `
                                   size="m"
                                   type="arrowDown"
                                 >
-                                  <div
+                                  <span
                                     className="euiButtonContent__icon"
                                     data-euiicon-type="arrowDown"
                                     size="m"
diff --git a/src/plugins/kibana_react/public/exit_full_screen_button/__snapshots__/exit_full_screen_button.test.tsx.snap b/src/plugins/kibana_react/public/exit_full_screen_button/__snapshots__/exit_full_screen_button.test.tsx.snap
index d11a346b874c0..8541558eb4cea 100644
--- a/src/plugins/kibana_react/public/exit_full_screen_button/__snapshots__/exit_full_screen_button.test.tsx.snap
+++ b/src/plugins/kibana_react/public/exit_full_screen_button/__snapshots__/exit_full_screen_button.test.tsx.snap
@@ -39,7 +39,7 @@ exports[`is rendered 1`] = `
                   size="l"
                   type="logoElastic"
                 >
-                  <div
+                  <span
                     data-euiicon-type="logoElastic"
                     size="l"
                   />
@@ -80,7 +80,7 @@ exports[`is rendered 1`] = `
                   className="dshExitFullScreenButton__icon"
                   type="fullScreen"
                 >
-                  <div
+                  <span
                     className="dshExitFullScreenButton__icon"
                     data-euiicon-type="fullScreen"
                   />
diff --git a/src/plugins/kibana_react/public/split_panel/__snapshots__/split_panel.test.tsx.snap b/src/plugins/kibana_react/public/split_panel/__snapshots__/split_panel.test.tsx.snap
index 93126ef64382c..c0279f3d261b3 100644
--- a/src/plugins/kibana_react/public/split_panel/__snapshots__/split_panel.test.tsx.snap
+++ b/src/plugins/kibana_react/public/split_panel/__snapshots__/split_panel.test.tsx.snap
@@ -67,7 +67,7 @@ exports[`Split panel should render correctly 1`] = `
           <EuiIcon
             type="grabHorizontal"
           >
-            <div
+            <span
               data-euiicon-type="grabHorizontal"
             />
           </EuiIcon>
diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/header.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/header.test.tsx.snap
index f5c2d3efd56f7..b86a1aa966dc6 100644
--- a/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/header.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/header.test.tsx.snap
@@ -90,7 +90,7 @@ exports[`Intro component renders correctly 1`] = `
                               size="m"
                               type="eye"
                             >
-                              <div
+                              <span
                                 className="euiButtonContent__icon"
                                 data-euiicon-type="eye"
                                 size="m"
@@ -164,7 +164,7 @@ exports[`Intro component renders correctly 1`] = `
                               size="m"
                               type="trash"
                             >
-                              <div
+                              <span
                                 className="euiButtonContent__icon"
                                 data-euiicon-type="trash"
                                 size="m"
diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/intro.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/intro.test.tsx.snap
index ff179401e6f71..1877769d94af2 100644
--- a/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/intro.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/intro.test.tsx.snap
@@ -25,7 +25,7 @@ exports[`Intro component renders correctly 1`] = `
           size="m"
           type="alert"
         >
-          <div
+          <span
             aria-hidden="true"
             className="euiCallOutHeader__icon"
             data-euiicon-type="alert"
diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/not_found_errors.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/not_found_errors.test.tsx.snap
index d5372fd5b18d9..9e738296277cc 100644
--- a/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/not_found_errors.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/not_found_errors.test.tsx.snap
@@ -27,7 +27,7 @@ exports[`NotFoundErrors component renders correctly for index-pattern type 1`] =
           size="m"
           type="alert"
         >
-          <div
+          <span
             aria-hidden="true"
             className="euiCallOutHeader__icon"
             data-euiicon-type="alert"
@@ -104,7 +104,7 @@ exports[`NotFoundErrors component renders correctly for index-pattern-field type
           size="m"
           type="alert"
         >
-          <div
+          <span
             aria-hidden="true"
             className="euiCallOutHeader__icon"
             data-euiicon-type="alert"
@@ -181,7 +181,7 @@ exports[`NotFoundErrors component renders correctly for search type 1`] = `
           size="m"
           type="alert"
         >
-          <div
+          <span
             aria-hidden="true"
             className="euiCallOutHeader__icon"
             data-euiicon-type="alert"
@@ -258,7 +258,7 @@ exports[`NotFoundErrors component renders correctly for unknown type 1`] = `
           size="m"
           type="alert"
         >
-          <div
+          <span
             aria-hidden="true"
             className="euiCallOutHeader__icon"
             data-euiicon-type="alert"
diff --git a/src/plugins/vis_type_vislib/public/vislib/components/legend/__snapshots__/legend.test.tsx.snap b/src/plugins/vis_type_vislib/public/vislib/components/legend/__snapshots__/legend.test.tsx.snap
index 6e8d018bd8f0e..cf397d408f1bc 100644
--- a/src/plugins/vis_type_vislib/public/vislib/components/legend/__snapshots__/legend.test.tsx.snap
+++ b/src/plugins/vis_type_vislib/public/vislib/components/legend/__snapshots__/legend.test.tsx.snap
@@ -1,5 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`VisLegend Component Legend closed should match the snapshot 1`] = `"<div class=\\"visLegend\\"><button type=\\"button\\" class=\\"visLegend__toggle kbn-resetFocusState\\" aria-label=\\"Toggle legend\\" aria-expanded=\\"false\\" aria-controls=\\"legendId\\" data-test-subj=\\"vislibToggleLegend\\" title=\\"Toggle legend\\"><div data-euiicon-type=\\"list\\" color=\\"text\\"></div></button></div>"`;
+exports[`VisLegend Component Legend closed should match the snapshot 1`] = `"<div class=\\"visLegend\\"><button type=\\"button\\" class=\\"visLegend__toggle kbn-resetFocusState\\" aria-label=\\"Toggle legend\\" aria-expanded=\\"false\\" aria-controls=\\"legendId\\" data-test-subj=\\"vislibToggleLegend\\" title=\\"Toggle legend\\"><span data-euiicon-type=\\"list\\" color=\\"text\\"></span></button></div>"`;
 
-exports[`VisLegend Component Legend open should match the snapshot 1`] = `"<div class=\\"visLegend\\"><button type=\\"button\\" class=\\"visLegend__toggle kbn-resetFocusState visLegend__toggle--isOpen\\" aria-label=\\"Toggle legend\\" aria-expanded=\\"true\\" aria-controls=\\"legendId\\" data-test-subj=\\"vislibToggleLegend\\" title=\\"Toggle legend\\"><div data-euiicon-type=\\"list\\" color=\\"text\\"></div></button><ul class=\\"visLegend__list\\" id=\\"legendId\\"><li class=\\"visLegend__value\\"><div class=\\"euiPopover euiPopover--anchorDownCenter euiPopover--displayBlock\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty--flushLeft visLegend__button\\" type=\\"button\\" data-label=\\"A\\" title=\\"A\\" aria-label=\\"A, toggle options\\" data-test-subj=\\"legend-A\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div data-euiicon-type=\\"dot\\" color=\\"red\\" data-test-subj=\\"legendSelectedColor-red\\"></div><span class=\\"visLegend__valueTitle\\">A</span></span></span></button></div></div></li><li class=\\"visLegend__value\\"><div class=\\"euiPopover euiPopover--anchorDownCenter euiPopover--displayBlock\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty--flushLeft visLegend__button\\" type=\\"button\\" data-label=\\"B\\" title=\\"B\\" aria-label=\\"B, toggle options\\" data-test-subj=\\"legend-B\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div data-euiicon-type=\\"dot\\" color=\\"red\\" data-test-subj=\\"legendSelectedColor-red\\"></div><span class=\\"visLegend__valueTitle\\">B</span></span></span></button></div></div></li></ul></div>"`;
+exports[`VisLegend Component Legend open should match the snapshot 1`] = `"<div class=\\"visLegend\\"><button type=\\"button\\" class=\\"visLegend__toggle kbn-resetFocusState visLegend__toggle--isOpen\\" aria-label=\\"Toggle legend\\" aria-expanded=\\"true\\" aria-controls=\\"legendId\\" data-test-subj=\\"vislibToggleLegend\\" title=\\"Toggle legend\\"><span data-euiicon-type=\\"list\\" color=\\"text\\"></span></button><ul class=\\"visLegend__list\\" id=\\"legendId\\"><li class=\\"visLegend__value\\"><div class=\\"euiPopover euiPopover--anchorDownCenter euiPopover--displayBlock\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty--flushLeft visLegend__button\\" type=\\"button\\" data-label=\\"A\\" title=\\"A\\" aria-label=\\"A, toggle options\\" data-test-subj=\\"legend-A\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><span data-euiicon-type=\\"dot\\" color=\\"red\\" data-test-subj=\\"legendSelectedColor-red\\"></span><span class=\\"visLegend__valueTitle\\">A</span></span></span></button></div></div></li><li class=\\"visLegend__value\\"><div class=\\"euiPopover euiPopover--anchorDownCenter euiPopover--displayBlock\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonEmpty euiButtonEmpty--text euiButtonEmpty--xSmall euiButtonEmpty--flushLeft visLegend__button\\" type=\\"button\\" data-label=\\"B\\" title=\\"B\\" aria-label=\\"B, toggle options\\" data-test-subj=\\"legend-B\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><span data-euiicon-type=\\"dot\\" color=\\"red\\" data-test-subj=\\"legendSelectedColor-red\\"></span><span class=\\"visLegend__valueTitle\\">B</span></span></span></button></div></div></li></ul></div>"`;
diff --git a/src/plugins/visualizations/public/components/__snapshots__/visualization_noresults.test.js.snap b/src/plugins/visualizations/public/components/__snapshots__/visualization_noresults.test.js.snap
index 43fc2671ba42a..978c67fb71721 100644
--- a/src/plugins/visualizations/public/components/__snapshots__/visualization_noresults.test.js.snap
+++ b/src/plugins/visualizations/public/components/__snapshots__/visualization_noresults.test.js.snap
@@ -16,7 +16,7 @@ exports[`VisualizationNoResults should render according to snapshot 1`] = `
       <div
         class="euiTextColor euiTextColor--subdued"
       >
-        <div
+        <span
           color="subdued"
           data-euiicon-type="visualizeApp"
         />
diff --git a/src/plugins/visualizations/public/components/__snapshots__/visualization_requesterror.test.js.snap b/src/plugins/visualizations/public/components/__snapshots__/visualization_requesterror.test.js.snap
index 95b0e884e79dc..d1dde7340cfa1 100644
--- a/src/plugins/visualizations/public/components/__snapshots__/visualization_requesterror.test.js.snap
+++ b/src/plugins/visualizations/public/components/__snapshots__/visualization_requesterror.test.js.snap
@@ -10,7 +10,7 @@ exports[`VisualizationRequestError should render according to snapshot 1`] = `
     <div
       class="euiTextColor euiTextColor--subdued"
     >
-      <div
+      <span
         color="danger"
         data-euiicon-type="alert"
       />
diff --git a/src/plugins/visualizations/public/wizard/__snapshots__/new_vis_modal.test.tsx.snap b/src/plugins/visualizations/public/wizard/__snapshots__/new_vis_modal.test.tsx.snap
index 2d55059efb5bb..02c0b36d12689 100644
--- a/src/plugins/visualizations/public/wizard/__snapshots__/new_vis_modal.test.tsx.snap
+++ b/src/plugins/visualizations/public/wizard/__snapshots__/new_vis_modal.test.tsx.snap
@@ -154,7 +154,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                 class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
                 type="button"
               >
-                <div
+                <span
                   aria-hidden="true"
                   class="euiButtonIcon__icon"
                   data-euiicon-type="cross"
@@ -207,7 +207,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                 <span
                                   class="euiFormControlLayoutCustomIcon"
                                 >
-                                  <div
+                                  <span
                                     aria-hidden="true"
                                     class="euiFormControlLayoutCustomIcon__icon"
                                     data-euiicon-type="search"
@@ -222,7 +222,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                   class="euiFormControlLayoutClearButton"
                                   type="button"
                                 >
-                                  <div
+                                  <span
                                     class="euiFormControlLayoutClearButton__icon"
                                     data-euiicon-type="cross"
                                   />
@@ -258,7 +258,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                   <div
                                     class="euiKeyPadMenuItem__icon"
                                   >
-                                    <div
+                                    <span
                                       color="secondary"
                                       data-euiicon-type="empty"
                                     />
@@ -289,7 +289,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                   <div
                                     class="euiKeyPadMenuItem__icon"
                                   >
-                                    <div
+                                    <span
                                       color="secondary"
                                       data-euiicon-type="empty"
                                     />
@@ -320,7 +320,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                   <div
                                     class="euiKeyPadMenuItem__icon"
                                   >
-                                    <div
+                                    <span
                                       color="secondary"
                                       data-euiicon-type="empty"
                                     />
@@ -352,7 +352,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                   <div
                                     class="euiKeyPadMenuItem__icon"
                                   >
-                                    <div
+                                    <span
                                       color="secondary"
                                       data-euiicon-type="empty"
                                     />
@@ -402,7 +402,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                           <span
                             class="euiButtonContent euiButtonContent--iconRight euiButton__content"
                           >
-                            <div
+                            <span
                               class="euiButtonContent__icon"
                               data-euiicon-type="popout"
                             />
@@ -461,7 +461,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                       size="m"
                       type="cross"
                     >
-                      <div
+                      <span
                         aria-hidden="true"
                         className="euiButtonIcon__icon"
                         data-euiicon-type="cross"
@@ -597,7 +597,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                                       className="euiFormControlLayoutCustomIcon__icon"
                                                       type="search"
                                                     >
-                                                      <div
+                                                      <span
                                                         aria-hidden="true"
                                                         className="euiFormControlLayoutCustomIcon__icon"
                                                         data-euiicon-type="search"
@@ -626,7 +626,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                                         className="euiFormControlLayoutClearButton__icon"
                                                         type="cross"
                                                       >
-                                                        <div
+                                                        <span
                                                           className="euiFormControlLayoutClearButton__icon"
                                                           data-euiicon-type="cross"
                                                         />
@@ -723,7 +723,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                                       size="l"
                                                       type="empty"
                                                     >
-                                                      <div
+                                                      <span
                                                         color="secondary"
                                                         data-euiicon-type="empty"
                                                         size="l"
@@ -792,7 +792,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                                       size="l"
                                                       type="empty"
                                                     >
-                                                      <div
+                                                      <span
                                                         color="secondary"
                                                         data-euiicon-type="empty"
                                                         size="l"
@@ -861,7 +861,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                                       size="l"
                                                       type="empty"
                                                     >
-                                                      <div
+                                                      <span
                                                         color="secondary"
                                                         data-euiicon-type="empty"
                                                         size="l"
@@ -930,7 +930,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                                       size="l"
                                                       type="empty"
                                                     >
-                                                      <div
+                                                      <span
                                                         color="secondary"
                                                         data-euiicon-type="empty"
                                                         size="l"
@@ -1063,7 +1063,7 @@ exports[`NewVisModal filter for visualization types should render as expected 1`
                                               size="m"
                                               type="popout"
                                             >
-                                              <div
+                                              <span
                                                 className="euiButtonContent__icon"
                                                 data-euiicon-type="popout"
                                                 size="m"
@@ -1252,7 +1252,7 @@ exports[`NewVisModal should render as expected 1`] = `
                 class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
                 type="button"
               >
-                <div
+                <span
                   aria-hidden="true"
                   class="euiButtonIcon__icon"
                   data-euiicon-type="cross"
@@ -1293,7 +1293,7 @@ exports[`NewVisModal should render as expected 1`] = `
                             >
                               <input
                                 aria-label="Filter for a visualization type"
-                                class="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch-isClearable"
+                                class="euiFieldSearch euiFieldSearch--fullWidth"
                                 data-test-subj="filterVisType"
                                 placeholder="Filter"
                                 type="search"
@@ -1305,7 +1305,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                 <span
                                   class="euiFormControlLayoutCustomIcon"
                                 >
-                                  <div
+                                  <span
                                     aria-hidden="true"
                                     class="euiFormControlLayoutCustomIcon__icon"
                                     data-euiicon-type="search"
@@ -1340,7 +1340,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                   <div
                                     class="euiKeyPadMenuItem__icon"
                                   >
-                                    <div
+                                    <span
                                       color="secondary"
                                       data-euiicon-type="empty"
                                     />
@@ -1371,7 +1371,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                   <div
                                     class="euiKeyPadMenuItem__icon"
                                   >
-                                    <div
+                                    <span
                                       color="secondary"
                                       data-euiicon-type="empty"
                                     />
@@ -1402,7 +1402,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                   <div
                                     class="euiKeyPadMenuItem__icon"
                                   >
-                                    <div
+                                    <span
                                       color="secondary"
                                       data-euiicon-type="empty"
                                     />
@@ -1433,7 +1433,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                   <div
                                     class="euiKeyPadMenuItem__icon"
                                   >
-                                    <div
+                                    <span
                                       color="secondary"
                                       data-euiicon-type="empty"
                                     />
@@ -1483,7 +1483,7 @@ exports[`NewVisModal should render as expected 1`] = `
                           <span
                             class="euiButtonContent euiButtonContent--iconRight euiButton__content"
                           >
-                            <div
+                            <span
                               class="euiButtonContent__icon"
                               data-euiicon-type="popout"
                             />
@@ -1542,7 +1542,7 @@ exports[`NewVisModal should render as expected 1`] = `
                       size="m"
                       type="cross"
                     >
-                      <div
+                      <span
                         aria-hidden="true"
                         className="euiButtonIcon__icon"
                         data-euiicon-type="cross"
@@ -1641,7 +1641,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                             <EuiValidatableControl>
                                               <input
                                                 aria-label="Filter for a visualization type"
-                                                className="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch-isClearable"
+                                                className="euiFieldSearch euiFieldSearch--fullWidth"
                                                 data-test-subj="filterVisType"
                                                 onChange={[Function]}
                                                 onKeyUp={[Function]}
@@ -1668,7 +1668,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                                       className="euiFormControlLayoutCustomIcon__icon"
                                                       type="search"
                                                     >
-                                                      <div
+                                                      <span
                                                         aria-hidden="true"
                                                         className="euiFormControlLayoutCustomIcon__icon"
                                                         data-euiicon-type="search"
@@ -1753,7 +1753,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                                       size="l"
                                                       type="empty"
                                                     >
-                                                      <div
+                                                      <span
                                                         color="secondary"
                                                         data-euiicon-type="empty"
                                                         size="l"
@@ -1822,7 +1822,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                                       size="l"
                                                       type="empty"
                                                     >
-                                                      <div
+                                                      <span
                                                         color="secondary"
                                                         data-euiicon-type="empty"
                                                         size="l"
@@ -1891,7 +1891,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                                       size="l"
                                                       type="empty"
                                                     >
-                                                      <div
+                                                      <span
                                                         color="secondary"
                                                         data-euiicon-type="empty"
                                                         size="l"
@@ -1960,7 +1960,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                                       size="l"
                                                       type="empty"
                                                     >
-                                                      <div
+                                                      <span
                                                         color="secondary"
                                                         data-euiicon-type="empty"
                                                         size="l"
@@ -2093,7 +2093,7 @@ exports[`NewVisModal should render as expected 1`] = `
                                               size="m"
                                               type="popout"
                                             >
-                                              <div
+                                              <span
                                                 className="euiButtonContent__icon"
                                                 data-euiicon-type="popout"
                                                 size="m"
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 0d6d0286c5a8f..7236ac8afbda6 100644
--- a/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
+++ b/test/interpreter_functional/plugins/kbn_tp_run_pipeline/package.json
@@ -12,7 +12,7 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "@elastic/eui": "29.3.0",
+    "@elastic/eui": "29.5.0",
     "@kbn/plugin-helpers": "1.0.0",
     "react": "^16.12.0",
     "react-dom": "^16.12.0",
diff --git a/test/plugin_functional/plugins/kbn_sample_panel_action/package.json b/test/plugin_functional/plugins/kbn_sample_panel_action/package.json
index 8efd2ee432415..98a8f050bddd3 100644
--- a/test/plugin_functional/plugins/kbn_sample_panel_action/package.json
+++ b/test/plugin_functional/plugins/kbn_sample_panel_action/package.json
@@ -12,7 +12,7 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "@elastic/eui": "29.3.0",
+    "@elastic/eui": "29.5.0",
     "react": "^16.12.0",
     "typescript": "4.0.2"
   }
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 4405063e54c06..8c0815b896a0e 100644
--- a/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
+++ b/test/plugin_functional/plugins/kbn_tp_custom_visualizations/package.json
@@ -12,7 +12,7 @@
     "build": "rm -rf './target' && tsc"
   },
   "devDependencies": {
-    "@elastic/eui": "29.3.0",
+    "@elastic/eui": "29.5.0",
     "@kbn/plugin-helpers": "1.0.0",
     "react": "^16.12.0",
     "typescript": "4.0.2"
diff --git a/x-pack/package.json b/x-pack/package.json
index 91fecff094110..d91e11134f9c8 100644
--- a/x-pack/package.json
+++ b/x-pack/package.json
@@ -266,7 +266,7 @@
     "@babel/runtime": "^7.11.2",
     "@elastic/datemath": "5.0.3",
     "@elastic/ems-client": "7.10.0",
-    "@elastic/eui": "29.3.0",
+    "@elastic/eui": "29.5.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/node-crypto": "1.2.1",
     "@elastic/numeral": "^2.5.0",
diff --git a/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap b/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap
index f45b4913243ee..b5a558621e9ca 100644
--- a/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap
+++ b/x-pack/plugins/apm/public/components/app/ErrorGroupOverview/List/__test__/__snapshots__/List.test.tsx.snap
@@ -111,7 +111,7 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
                       <span
                         className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                       >
-                        <div
+                        <span
                           className="euiButtonContent__icon"
                           data-euiicon-type="arrowDown"
                           size="m"
@@ -166,7 +166,7 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
                     onMouseOut={[Function]}
                     onMouseOver={[Function]}
                   >
-                    <div
+                    <span
                       aria-label="Info"
                       className="eui-alignTop"
                       color="subdued"
@@ -271,7 +271,7 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
                   >
                     Occurrences
                   </span>
-                  <div
+                  <span
                     aria-label="Sorted in descending order"
                     className="euiTableSortIcon"
                     data-euiicon-type="sortDown"
@@ -535,7 +535,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                       <span
                         className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                       >
-                        <div
+                        <span
                           className="euiButtonContent__icon"
                           data-euiicon-type="arrowDown"
                           size="m"
@@ -590,7 +590,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                     onMouseOut={[Function]}
                     onMouseOver={[Function]}
                   >
-                    <div
+                    <span
                       aria-label="Info"
                       className="eui-alignTop"
                       color="subdued"
@@ -695,7 +695,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                   >
                     Occurrences
                   </span>
-                  <div
+                  <span
                     aria-label="Sorted in descending order"
                     className="euiTableSortIcon"
                     data-euiicon-type="sortDown"
@@ -770,7 +770,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                   onMouseOut={[Function]}
                   onMouseOver={[Function]}
                 >
-                  <div
+                  <span
                     aria-label="Info"
                     className="eui-alignTop"
                     color="subdued"
@@ -1009,7 +1009,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                   onMouseOut={[Function]}
                   onMouseOver={[Function]}
                 >
-                  <div
+                  <span
                     aria-label="Info"
                     className="eui-alignTop"
                     color="subdued"
@@ -1248,7 +1248,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                   onMouseOut={[Function]}
                   onMouseOver={[Function]}
                 >
-                  <div
+                  <span
                     aria-label="Info"
                     className="eui-alignTop"
                     color="subdued"
@@ -1487,7 +1487,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                   onMouseOut={[Function]}
                   onMouseOver={[Function]}
                 >
-                  <div
+                  <span
                     aria-label="Info"
                     className="eui-alignTop"
                     color="subdued"
@@ -1736,7 +1736,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                 onClick={[Function]}
                 type="button"
               >
-                <div
+                <span
                   aria-hidden="true"
                   className="euiButtonIcon__icon"
                   data-euiicon-type="arrowLeft"
@@ -1779,7 +1779,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                 onClick={[Function]}
                 type="button"
               >
-                <div
+                <span
                   aria-hidden="true"
                   className="euiButtonIcon__icon"
                   data-euiicon-type="arrowRight"
diff --git a/x-pack/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/service_overview.test.tsx.snap b/x-pack/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/service_overview.test.tsx.snap
index 611ee4e07134c..49f30910ee0f1 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/service_overview.test.tsx.snap
+++ b/x-pack/plugins/apm/public/components/app/ServiceOverview/__test__/__snapshots__/service_overview.test.tsx.snap
@@ -106,7 +106,7 @@ NodeList [
                 <span
                   class="euiButtonContent euiButton__content"
                 >
-                  <div
+                  <span
                     class="euiButtonContent__icon"
                     data-euiicon-type="help"
                   />
@@ -283,7 +283,7 @@ NodeList [
               <div
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
-                <div
+                <span
                   color="subdued"
                   data-euiicon-type="visLine"
                 />
@@ -336,7 +336,7 @@ NodeList [
               <div
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
-                <div
+                <span
                   color="subdued"
                   data-euiicon-type="visLine"
                 />
@@ -389,7 +389,7 @@ NodeList [
               <div
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
-                <div
+                <span
                   color="subdued"
                   data-euiicon-type="visLine"
                 />
@@ -552,7 +552,7 @@ NodeList [
               <div
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
-                <div
+                <span
                   color="subdued"
                   data-euiicon-type="visLine"
                 />
@@ -605,7 +605,7 @@ NodeList [
               <div
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
-                <div
+                <span
                   color="subdued"
                   data-euiicon-type="visLine"
                 />
@@ -658,7 +658,7 @@ NodeList [
               <div
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
-                <div
+                <span
                   color="subdued"
                   data-euiicon-type="visLine"
                 />
diff --git a/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/__test__/__snapshots__/TransactionActionMenu.test.tsx.snap b/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/__test__/__snapshots__/TransactionActionMenu.test.tsx.snap
index 77f4828364966..fa6db645d28a8 100644
--- a/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/__test__/__snapshots__/TransactionActionMenu.test.tsx.snap
+++ b/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/__test__/__snapshots__/TransactionActionMenu.test.tsx.snap
@@ -16,7 +16,7 @@ exports[`TransactionActionMenu component matches the snapshot 1`] = `
         <span
           class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
         >
-          <div
+          <span
             class="euiButtonContent__icon"
             data-euiicon-type="arrowDown"
           />
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/component/__stories__/__snapshots__/dropdown_filter.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/component/__stories__/__snapshots__/dropdown_filter.stories.storyshot
index ebe8d117b8e81..5ad49a207ed3e 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/component/__stories__/__snapshots__/dropdown_filter.stories.storyshot
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/dropdown_filter/component/__stories__/__snapshots__/dropdown_filter.stories.storyshot
@@ -15,7 +15,7 @@ exports[`Storyshots renderers/DropdownFilter default 1`] = `
       -- ANY --
     </option>
   </select>
-  <div
+  <span
     className="canvasDropdownFilter__icon"
     data-euiicon-type="arrowDown"
   />
@@ -55,7 +55,7 @@ exports[`Storyshots renderers/DropdownFilter with choices 1`] = `
       Item Three
     </option>
   </select>
-  <div
+  <span
     className="canvasDropdownFilter__icon"
     data-euiicon-type="arrowDown"
   />
@@ -96,7 +96,7 @@ exports[`Storyshots renderers/DropdownFilter with choices and new value 1`] = `
       Item Three
     </option>
   </select>
-  <div
+  <span
     className="canvasDropdownFilter__icon"
     data-euiicon-type="arrowDown"
   />
@@ -137,7 +137,7 @@ exports[`Storyshots renderers/DropdownFilter with choices and value 1`] = `
       Item Three
     </option>
   </select>
-  <div
+  <span
     className="canvasDropdownFilter__icon"
     data-euiicon-type="arrowDown"
   />
@@ -160,7 +160,7 @@ exports[`Storyshots renderers/DropdownFilter with new value 1`] = `
       -- ANY --
     </option>
   </select>
-  <div
+  <span
     className="canvasDropdownFilter__icon"
     data-euiicon-type="arrowDown"
   />
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/components/__stories__/__snapshots__/time_filter.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/components/__stories__/__snapshots__/time_filter.stories.storyshot
index 9cc6643b75ac1..3fba41069253e 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/components/__stories__/__snapshots__/time_filter.stories.storyshot
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/components/__stories__/__snapshots__/time_filter.stories.storyshot
@@ -42,7 +42,7 @@ exports[`Storyshots renderers/TimeFilter default 1`] = `
                 <span
                   className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                 >
-                  <div
+                  <span
                     className="euiButtonContent__icon"
                     data-euiicon-type="arrowDown"
                     size="m"
@@ -50,7 +50,7 @@ exports[`Storyshots renderers/TimeFilter default 1`] = `
                   <span
                     className="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
                   >
-                    <div
+                    <span
                       data-euiicon-type="clock"
                     />
                   </span>
@@ -128,7 +128,7 @@ exports[`Storyshots renderers/TimeFilter with absolute time bounds 1`] = `
                 <span
                   className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                 >
-                  <div
+                  <span
                     className="euiButtonContent__icon"
                     data-euiicon-type="arrowDown"
                     size="m"
@@ -136,7 +136,7 @@ exports[`Storyshots renderers/TimeFilter with absolute time bounds 1`] = `
                   <span
                     className="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
                   >
-                    <div
+                    <span
                       data-euiicon-type="clock"
                     />
                   </span>
@@ -254,7 +254,7 @@ exports[`Storyshots renderers/TimeFilter with commonlyUsedRanges 1`] = `
                 <span
                   className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                 >
-                  <div
+                  <span
                     className="euiButtonContent__icon"
                     data-euiicon-type="arrowDown"
                     size="m"
@@ -262,7 +262,7 @@ exports[`Storyshots renderers/TimeFilter with commonlyUsedRanges 1`] = `
                   <span
                     className="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
                   >
-                    <div
+                    <span
                       data-euiicon-type="clock"
                     />
                   </span>
@@ -340,7 +340,7 @@ exports[`Storyshots renderers/TimeFilter with dateFormat 1`] = `
                 <span
                   className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                 >
-                  <div
+                  <span
                     className="euiButtonContent__icon"
                     data-euiicon-type="arrowDown"
                     size="m"
@@ -348,7 +348,7 @@ exports[`Storyshots renderers/TimeFilter with dateFormat 1`] = `
                   <span
                     className="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
                   >
-                    <div
+                    <span
                       data-euiicon-type="clock"
                     />
                   </span>
@@ -426,7 +426,7 @@ exports[`Storyshots renderers/TimeFilter with relative time bounds 1`] = `
                 <span
                   className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                 >
-                  <div
+                  <span
                     className="euiButtonContent__icon"
                     data-euiicon-type="arrowDown"
                     size="m"
@@ -434,7 +434,7 @@ exports[`Storyshots renderers/TimeFilter with relative time bounds 1`] = `
                   <span
                     className="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
                   >
-                    <div
+                    <span
                       data-euiicon-type="clock"
                     />
                   </span>
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/__stories__/__snapshots__/palette.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/__stories__/__snapshots__/palette.stories.storyshot
index c0d3256eb9eb7..320ec7733e197 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/__stories__/__snapshots__/palette.stories.storyshot
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/__stories__/__snapshots__/palette.stories.storyshot
@@ -69,7 +69,7 @@ exports[`Storyshots arguments/Palette default 1`] = `
             <span
               className="euiFormControlLayoutCustomIcon"
             >
-              <div
+              <span
                 aria-hidden="true"
                 className="euiFormControlLayoutCustomIcon__icon"
                 data-euiicon-type="arrowDown"
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__stories__/__snapshots__/extended_template.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__stories__/__snapshots__/extended_template.stories.storyshot
index 5feeff11ec675..60fd7f43044dc 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__stories__/__snapshots__/extended_template.stories.storyshot
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/axis_config/__stories__/__snapshots__/extended_template.stories.storyshot
@@ -59,7 +59,7 @@ exports[`Storyshots arguments/AxisConfig extended 1`] = `
             <span
               className="euiFormControlLayoutCustomIcon"
             >
-              <div
+              <span
                 aria-hidden="true"
                 className="euiFormControlLayoutCustomIcon__icon"
                 data-euiicon-type="arrowDown"
@@ -135,7 +135,7 @@ exports[`Storyshots arguments/AxisConfig/components extended 1`] = `
             <span
               className="euiFormControlLayoutCustomIcon"
             >
-              <div
+              <span
                 aria-hidden="true"
                 className="euiFormControlLayoutCustomIcon__icon"
                 data-euiicon-type="arrowDown"
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/__stories__/__snapshots__/date_format.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/__stories__/__snapshots__/date_format.stories.storyshot
index c71d7a5990c74..8f0a8b5abd9b5 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/__stories__/__snapshots__/date_format.stories.storyshot
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/date_format/__stories__/__snapshots__/date_format.stories.storyshot
@@ -42,7 +42,7 @@ Array [
         <span
           className="euiFormControlLayoutCustomIcon"
         >
-          <div
+          <span
             aria-hidden="true"
             className="euiFormControlLayoutCustomIcon__icon"
             data-euiicon-type="arrowDown"
@@ -114,7 +114,7 @@ Array [
         <span
           className="euiFormControlLayoutCustomIcon"
         >
-          <div
+          <span
             aria-hidden="true"
             className="euiFormControlLayoutCustomIcon__icon"
             data-euiicon-type="arrowDown"
@@ -185,7 +185,7 @@ exports[`Storyshots arguments/DateFormat with preset format 1`] = `
       <span
         className="euiFormControlLayoutCustomIcon"
       >
-        <div
+        <span
           aria-hidden="true"
           className="euiFormControlLayoutCustomIcon__icon"
           data-euiicon-type="arrowDown"
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/__stories__/__snapshots__/number_format.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/__stories__/__snapshots__/number_format.stories.storyshot
index 4ce238e6ea14f..17f158c680a67 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/__stories__/__snapshots__/number_format.stories.storyshot
+++ b/x-pack/plugins/canvas/canvas_plugin_src/uis/arguments/number_format/__stories__/__snapshots__/number_format.stories.storyshot
@@ -52,7 +52,7 @@ Array [
         <span
           className="euiFormControlLayoutCustomIcon"
         >
-          <div
+          <span
             aria-hidden="true"
             className="euiFormControlLayoutCustomIcon__icon"
             data-euiicon-type="arrowDown"
@@ -134,7 +134,7 @@ Array [
         <span
           className="euiFormControlLayoutCustomIcon"
         >
-          <div
+          <span
             aria-hidden="true"
             className="euiFormControlLayoutCustomIcon__icon"
             data-euiicon-type="arrowDown"
@@ -215,7 +215,7 @@ exports[`Storyshots arguments/NumberFormat with preset format 1`] = `
       <span
         className="euiFormControlLayoutCustomIcon"
       >
-        <div
+        <span
           aria-hidden="true"
           className="euiFormControlLayoutCustomIcon__icon"
           data-euiicon-type="arrowDown"
diff --git a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset.stories.storyshot b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset.stories.storyshot
index 14791cd3d8b25..e62785272a5ec 100644
--- a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset.stories.storyshot
@@ -75,7 +75,7 @@ exports[`Storyshots components/Assets/Asset airplane 1`] = `
               onFocus={[Function]}
               type="button"
             >
-              <div
+              <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
                 data-euiicon-type="vector"
@@ -105,7 +105,7 @@ exports[`Storyshots components/Assets/Asset airplane 1`] = `
                 className="euiButtonIcon euiButtonIcon--primary"
                 type="button"
               >
-                <div
+                <span
                   aria-hidden="true"
                   className="euiButtonIcon__icon"
                   data-euiicon-type="sortDown"
@@ -136,7 +136,7 @@ exports[`Storyshots components/Assets/Asset airplane 1`] = `
                 className="euiButtonIcon euiButtonIcon--primary"
                 type="button"
               >
-                <div
+                <span
                   aria-hidden="true"
                   className="euiButtonIcon__icon"
                   data-euiicon-type="copyClipboard"
@@ -163,7 +163,7 @@ exports[`Storyshots components/Assets/Asset airplane 1`] = `
               onFocus={[Function]}
               type="button"
             >
-              <div
+              <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
                 data-euiicon-type="trash"
@@ -253,7 +253,7 @@ exports[`Storyshots components/Assets/Asset marker 1`] = `
               onFocus={[Function]}
               type="button"
             >
-              <div
+              <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
                 data-euiicon-type="vector"
@@ -283,7 +283,7 @@ exports[`Storyshots components/Assets/Asset marker 1`] = `
                 className="euiButtonIcon euiButtonIcon--primary"
                 type="button"
               >
-                <div
+                <span
                   aria-hidden="true"
                   className="euiButtonIcon__icon"
                   data-euiicon-type="sortDown"
@@ -314,7 +314,7 @@ exports[`Storyshots components/Assets/Asset marker 1`] = `
                 className="euiButtonIcon euiButtonIcon--primary"
                 type="button"
               >
-                <div
+                <span
                   aria-hidden="true"
                   className="euiButtonIcon__icon"
                   data-euiicon-type="copyClipboard"
@@ -341,7 +341,7 @@ exports[`Storyshots components/Assets/Asset marker 1`] = `
               onFocus={[Function]}
               type="button"
             >
-              <div
+              <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
                 data-euiicon-type="trash"
diff --git a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot
index 26e586f4564dc..8225f6414385d 100644
--- a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot
@@ -20,7 +20,7 @@ exports[`Storyshots components/Assets/AssetManager no assets 1`] = `
       onClick={[Function]}
       type="button"
     >
-      <div
+      <span
         aria-hidden="true"
         className="euiButtonIcon__icon"
         data-euiicon-type="cross"
@@ -65,7 +65,7 @@ exports[`Storyshots components/Assets/AssetManager no assets 1`] = `
                   className="euiFilePicker__prompt"
                   id="generated-id"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     className="euiFilePicker__icon"
                     data-euiicon-type="importAction"
@@ -108,7 +108,7 @@ exports[`Storyshots components/Assets/AssetManager no assets 1`] = `
             <div
               className="euiEmptyPrompt"
             >
-              <div
+              <span
                 color="subdued"
                 data-euiicon-type="importAction"
                 size="xxl"
@@ -201,7 +201,7 @@ exports[`Storyshots components/Assets/AssetManager two assets 1`] = `
       onClick={[Function]}
       type="button"
     >
-      <div
+      <span
         aria-hidden="true"
         className="euiButtonIcon__icon"
         data-euiicon-type="cross"
@@ -246,7 +246,7 @@ exports[`Storyshots components/Assets/AssetManager two assets 1`] = `
                   className="euiFilePicker__prompt"
                   id="generated-id"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     className="euiFilePicker__icon"
                     data-euiicon-type="importAction"
@@ -353,7 +353,7 @@ exports[`Storyshots components/Assets/AssetManager two assets 1`] = `
                         onFocus={[Function]}
                         type="button"
                       >
-                        <div
+                        <span
                           aria-hidden="true"
                           className="euiButtonIcon__icon"
                           data-euiicon-type="vector"
@@ -383,7 +383,7 @@ exports[`Storyshots components/Assets/AssetManager two assets 1`] = `
                           className="euiButtonIcon euiButtonIcon--primary"
                           type="button"
                         >
-                          <div
+                          <span
                             aria-hidden="true"
                             className="euiButtonIcon__icon"
                             data-euiicon-type="sortDown"
@@ -414,7 +414,7 @@ exports[`Storyshots components/Assets/AssetManager two assets 1`] = `
                           className="euiButtonIcon euiButtonIcon--primary"
                           type="button"
                         >
-                          <div
+                          <span
                             aria-hidden="true"
                             className="euiButtonIcon__icon"
                             data-euiicon-type="copyClipboard"
@@ -441,7 +441,7 @@ exports[`Storyshots components/Assets/AssetManager two assets 1`] = `
                         onFocus={[Function]}
                         type="button"
                       >
-                        <div
+                        <span
                           aria-hidden="true"
                           className="euiButtonIcon__icon"
                           data-euiicon-type="trash"
@@ -520,7 +520,7 @@ exports[`Storyshots components/Assets/AssetManager two assets 1`] = `
                         onFocus={[Function]}
                         type="button"
                       >
-                        <div
+                        <span
                           aria-hidden="true"
                           className="euiButtonIcon__icon"
                           data-euiicon-type="vector"
@@ -550,7 +550,7 @@ exports[`Storyshots components/Assets/AssetManager two assets 1`] = `
                           className="euiButtonIcon euiButtonIcon--primary"
                           type="button"
                         >
-                          <div
+                          <span
                             aria-hidden="true"
                             className="euiButtonIcon__icon"
                             data-euiicon-type="sortDown"
@@ -581,7 +581,7 @@ exports[`Storyshots components/Assets/AssetManager two assets 1`] = `
                           className="euiButtonIcon euiButtonIcon--primary"
                           type="button"
                         >
-                          <div
+                          <span
                             aria-hidden="true"
                             className="euiButtonIcon__icon"
                             data-euiicon-type="copyClipboard"
@@ -608,7 +608,7 @@ exports[`Storyshots components/Assets/AssetManager two assets 1`] = `
                         onFocus={[Function]}
                         type="button"
                       >
-                        <div
+                        <span
                           aria-hidden="true"
                           className="euiButtonIcon__icon"
                           data-euiicon-type="trash"
diff --git a/x-pack/plugins/canvas/public/components/color_dot/__stories__/__snapshots__/color_dot.stories.storyshot b/x-pack/plugins/canvas/public/components/color_dot/__stories__/__snapshots__/color_dot.stories.storyshot
index 7368a457766ac..056b87294f245 100644
--- a/x-pack/plugins/canvas/public/components/color_dot/__stories__/__snapshots__/color_dot.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/color_dot/__stories__/__snapshots__/color_dot.stories.storyshot
@@ -126,7 +126,7 @@ Array [
         }
       }
     >
-      <div
+      <span
         color="#000"
         data-euiicon-type="plusInCircle"
       />
@@ -146,7 +146,7 @@ Array [
         }
       }
     >
-      <div
+      <span
         color="#fff"
         data-euiicon-type="minusInCircle"
       />
@@ -166,7 +166,7 @@ Array [
         }
       }
     >
-      <div
+      <span
         color="#fff"
         data-euiicon-type="alert"
       />
@@ -186,7 +186,7 @@ Array [
         }
       }
     >
-      <div
+      <span
         color="#fff"
         data-euiicon-type="check"
       />
diff --git a/x-pack/plugins/canvas/public/components/color_manager/__stories__/__snapshots__/color_manager.stories.storyshot b/x-pack/plugins/canvas/public/components/color_manager/__stories__/__snapshots__/color_manager.stories.storyshot
index 89c8d1b8b1716..8d8bc4bb73886 100644
--- a/x-pack/plugins/canvas/public/components/color_manager/__stories__/__snapshots__/color_manager.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/color_manager/__stories__/__snapshots__/color_manager.stories.storyshot
@@ -388,7 +388,7 @@ exports[`Storyshots components/Color/ColorManager interactive 1`] = `
         onClick={[Function]}
         type="button"
       >
-        <div
+        <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
           data-euiicon-type="plusInCircle"
@@ -402,7 +402,7 @@ exports[`Storyshots components/Color/ColorManager interactive 1`] = `
         onClick={[Function]}
         type="button"
       >
-        <div
+        <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
           data-euiicon-type="minusInCircle"
@@ -798,7 +798,7 @@ Array [
         onClick={[Function]}
         type="button"
       >
-        <div
+        <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
           data-euiicon-type="plusInCircle"
@@ -812,7 +812,7 @@ Array [
         onClick={[Function]}
         type="button"
       >
-        <div
+        <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
           data-euiicon-type="minusInCircle"
@@ -877,7 +877,7 @@ Array [
         onClick={[Function]}
         type="button"
       >
-        <div
+        <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
           data-euiicon-type="plusInCircle"
@@ -891,7 +891,7 @@ Array [
         onClick={[Function]}
         type="button"
       >
-        <div
+        <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
           data-euiicon-type="minusInCircle"
@@ -956,7 +956,7 @@ Array [
         onClick={[Function]}
         type="button"
       >
-        <div
+        <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
           data-euiicon-type="plusInCircle"
@@ -970,7 +970,7 @@ Array [
         onClick={[Function]}
         type="button"
       >
-        <div
+        <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
           data-euiicon-type="minusInCircle"
diff --git a/x-pack/plugins/canvas/public/components/color_palette/__stories__/__snapshots__/color_palette.stories.storyshot b/x-pack/plugins/canvas/public/components/color_palette/__stories__/__snapshots__/color_palette.stories.storyshot
index 4ad0570c68df2..f03e1ac3554ec 100644
--- a/x-pack/plugins/canvas/public/components/color_palette/__stories__/__snapshots__/color_palette.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/color_palette/__stories__/__snapshots__/color_palette.stories.storyshot
@@ -376,7 +376,7 @@ Array [
               }
             }
           >
-            <div
+            <span
               className="selected-color"
               color="#333"
               data-euiicon-type="check"
@@ -729,7 +729,7 @@ exports[`Storyshots components/Color/ColorPalette six colors, wrap at 4 1`] = `
             }
           }
         >
-          <div
+          <span
             className="selected-color"
             color="#333"
             data-euiicon-type="check"
@@ -1002,7 +1002,7 @@ Array [
               }
             }
           >
-            <div
+            <span
               className="selected-color"
               color="#333"
               data-euiicon-type="check"
diff --git a/x-pack/plugins/canvas/public/components/color_picker/__stories__/__snapshots__/color_picker.stories.storyshot b/x-pack/plugins/canvas/public/components/color_picker/__stories__/__snapshots__/color_picker.stories.storyshot
index 972e707fc3441..e056baec240c5 100644
--- a/x-pack/plugins/canvas/public/components/color_picker/__stories__/__snapshots__/color_picker.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/color_picker/__stories__/__snapshots__/color_picker.stories.storyshot
@@ -225,7 +225,7 @@ exports[`Storyshots components/Color/ColorPicker interactive 1`] = `
           onClick={[Function]}
           type="button"
         >
-          <div
+          <span
             aria-hidden="true"
             className="euiButtonIcon__icon"
             data-euiicon-type="plusInCircle"
@@ -239,7 +239,7 @@ exports[`Storyshots components/Color/ColorPicker interactive 1`] = `
           onClick={[Function]}
           type="button"
         >
-          <div
+          <span
             aria-hidden="true"
             className="euiButtonIcon__icon"
             data-euiicon-type="minusInCircle"
@@ -305,7 +305,7 @@ exports[`Storyshots components/Color/ColorPicker six colors 1`] = `
               }
             }
           >
-            <div
+            <span
               className="selected-color"
               color="#333"
               data-euiicon-type="check"
@@ -506,7 +506,7 @@ exports[`Storyshots components/Color/ColorPicker six colors 1`] = `
         onClick={[Function]}
         type="button"
       >
-        <div
+        <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
           data-euiicon-type="plusInCircle"
@@ -520,7 +520,7 @@ exports[`Storyshots components/Color/ColorPicker six colors 1`] = `
         onClick={[Function]}
         type="button"
       >
-        <div
+        <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
           data-euiicon-type="minusInCircle"
@@ -760,7 +760,7 @@ exports[`Storyshots components/Color/ColorPicker six colors, value missing 1`] =
         onClick={[Function]}
         type="button"
       >
-        <div
+        <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
           data-euiicon-type="plusInCircle"
@@ -774,7 +774,7 @@ exports[`Storyshots components/Color/ColorPicker six colors, value missing 1`] =
         onClick={[Function]}
         type="button"
       >
-        <div
+        <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
           data-euiicon-type="minusInCircle"
@@ -819,7 +819,7 @@ exports[`Storyshots components/Color/ColorPicker three colors 1`] = `
               }
             }
           >
-            <div
+            <span
               className="selected-color"
               color="#333"
               data-euiicon-type="check"
@@ -939,7 +939,7 @@ exports[`Storyshots components/Color/ColorPicker three colors 1`] = `
         onClick={[Function]}
         type="button"
       >
-        <div
+        <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
           data-euiicon-type="plusInCircle"
@@ -953,7 +953,7 @@ exports[`Storyshots components/Color/ColorPicker three colors 1`] = `
         onClick={[Function]}
         type="button"
       >
-        <div
+        <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
           data-euiicon-type="minusInCircle"
diff --git a/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/__snapshots__/custom_element_modal.stories.storyshot b/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/__snapshots__/custom_element_modal.stories.storyshot
index 0903b4f14084f..f1d0d5fbd28ef 100644
--- a/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/__snapshots__/custom_element_modal.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/__snapshots__/custom_element_modal.stories.storyshot
@@ -21,7 +21,7 @@ exports[`Storyshots components/Elements/CustomElementModal with description 1`]
       onClick={[Function]}
       type="button"
     >
-      <div
+      <span
         aria-hidden="true"
         className="euiButtonIcon__icon"
         data-euiicon-type="cross"
@@ -175,7 +175,7 @@ exports[`Storyshots components/Elements/CustomElementModal with description 1`]
                         className="euiFilePicker__prompt"
                         id="generated-id-filePicker__prompt"
                       >
-                        <div
+                        <span
                           aria-hidden="true"
                           className="euiFilePicker__icon"
                           data-euiicon-type="importAction"
@@ -217,7 +217,7 @@ exports[`Storyshots components/Elements/CustomElementModal with description 1`]
                 <div
                   className="euiCard__top"
                 >
-                  <div
+                  <span
                     className="euiCard__icon"
                     data-euiicon-type="canvasApp"
                     size="xxl"
@@ -322,7 +322,7 @@ exports[`Storyshots components/Elements/CustomElementModal with image 1`] = `
       onClick={[Function]}
       type="button"
     >
-      <div
+      <span
         aria-hidden="true"
         className="euiButtonIcon__icon"
         data-euiicon-type="cross"
@@ -476,7 +476,7 @@ exports[`Storyshots components/Elements/CustomElementModal with image 1`] = `
                         className="euiFilePicker__prompt"
                         id="generated-id-filePicker__prompt"
                       >
-                        <div
+                        <span
                           aria-hidden="true"
                           className="euiFilePicker__icon"
                           data-euiicon-type="importAction"
@@ -627,7 +627,7 @@ exports[`Storyshots components/Elements/CustomElementModal with name 1`] = `
       onClick={[Function]}
       type="button"
     >
-      <div
+      <span
         aria-hidden="true"
         className="euiButtonIcon__icon"
         data-euiicon-type="cross"
@@ -781,7 +781,7 @@ exports[`Storyshots components/Elements/CustomElementModal with name 1`] = `
                         className="euiFilePicker__prompt"
                         id="generated-id-filePicker__prompt"
                       >
-                        <div
+                        <span
                           aria-hidden="true"
                           className="euiFilePicker__icon"
                           data-euiicon-type="importAction"
@@ -823,7 +823,7 @@ exports[`Storyshots components/Elements/CustomElementModal with name 1`] = `
                 <div
                   className="euiCard__top"
                 >
-                  <div
+                  <span
                     className="euiCard__icon"
                     data-euiicon-type="canvasApp"
                     size="xxl"
@@ -927,7 +927,7 @@ exports[`Storyshots components/Elements/CustomElementModal with title 1`] = `
       onClick={[Function]}
       type="button"
     >
-      <div
+      <span
         aria-hidden="true"
         className="euiButtonIcon__icon"
         data-euiicon-type="cross"
@@ -1081,7 +1081,7 @@ exports[`Storyshots components/Elements/CustomElementModal with title 1`] = `
                         className="euiFilePicker__prompt"
                         id="generated-id-filePicker__prompt"
                       >
-                        <div
+                        <span
                           aria-hidden="true"
                           className="euiFilePicker__icon"
                           data-euiicon-type="importAction"
@@ -1123,7 +1123,7 @@ exports[`Storyshots components/Elements/CustomElementModal with title 1`] = `
                 <div
                   className="euiCard__top"
                 >
-                  <div
+                  <span
                     className="euiCard__icon"
                     data-euiicon-type="canvasApp"
                     size="xxl"
diff --git a/x-pack/plugins/canvas/public/components/datasource/__stories__/__snapshots__/datasource_component.stories.storyshot b/x-pack/plugins/canvas/public/components/datasource/__stories__/__snapshots__/datasource_component.stories.storyshot
index 373c147c2a5b8..a3b6cae4c5f53 100644
--- a/x-pack/plugins/canvas/public/components/datasource/__stories__/__snapshots__/datasource_component.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/datasource/__stories__/__snapshots__/datasource_component.stories.storyshot
@@ -12,7 +12,7 @@ exports[`Storyshots components/datasource/DatasourceComponent datasource with ex
     <span
       className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
     >
-      <div
+      <span
         className="euiButtonContent__icon"
         data-euiicon-type="arrowRight"
         size="m"
@@ -20,7 +20,7 @@ exports[`Storyshots components/datasource/DatasourceComponent datasource with ex
       <span
         className="euiButtonEmpty__text"
       >
-        <div
+        <span
           className="canvasDataSource__triggerButtonIcon"
           data-euiicon-type="training"
         />
@@ -57,7 +57,7 @@ exports[`Storyshots components/datasource/DatasourceComponent simple datasource
     <span
       className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
     >
-      <div
+      <span
         className="euiButtonContent__icon"
         data-euiicon-type="arrowRight"
         size="m"
@@ -65,7 +65,7 @@ exports[`Storyshots components/datasource/DatasourceComponent simple datasource
       <span
         className="euiButtonEmpty__text"
       >
-        <div
+        <span
           className="canvasDataSource__triggerButtonIcon"
           data-euiicon-type="training"
         />
diff --git a/x-pack/plugins/canvas/public/components/element_card/__stories__/__snapshots__/element_card.stories.storyshot b/x-pack/plugins/canvas/public/components/element_card/__stories__/__snapshots__/element_card.stories.storyshot
index fb9b465cea813..09ec027017770 100644
--- a/x-pack/plugins/canvas/public/components/element_card/__stories__/__snapshots__/element_card.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/element_card/__stories__/__snapshots__/element_card.stories.storyshot
@@ -15,7 +15,7 @@ exports[`Storyshots components/Elements/ElementCard with click handler 1`] = `
     <div
       className="euiCard__top"
     >
-      <div
+      <span
         className="euiCard__icon"
         data-euiicon-type="canvasApp"
         size="xxl"
@@ -116,7 +116,7 @@ exports[`Storyshots components/Elements/ElementCard with tags 1`] = `
     <div
       className="euiCard__top"
     >
-      <div
+      <span
         className="euiCard__icon"
         data-euiicon-type="canvasApp"
         size="xxl"
@@ -283,7 +283,7 @@ exports[`Storyshots components/Elements/ElementCard with title and description 1
     <div
       className="euiCard__top"
     >
-      <div
+      <span
         className="euiCard__icon"
         data-euiicon-type="canvasApp"
         size="xxl"
diff --git a/x-pack/plugins/canvas/public/components/file_upload/__snapshots__/file_upload.stories.storyshot b/x-pack/plugins/canvas/public/components/file_upload/__snapshots__/file_upload.stories.storyshot
index b014b6da2ee45..5fe43c95d271d 100644
--- a/x-pack/plugins/canvas/public/components/file_upload/__snapshots__/file_upload.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/file_upload/__snapshots__/file_upload.stories.storyshot
@@ -21,7 +21,7 @@ exports[`Storyshots components/FileUpload default 1`] = `
       className="euiFilePicker__prompt"
       id="generated-id"
     >
-      <div
+      <span
         aria-hidden="true"
         className="euiFilePicker__icon"
         data-euiicon-type="importAction"
diff --git a/x-pack/plugins/canvas/public/components/font_picker/__stories__/__snapshots__/font_picker.stories.storyshot b/x-pack/plugins/canvas/public/components/font_picker/__stories__/__snapshots__/font_picker.stories.storyshot
index f4b3b9ed8546a..12daa9c98377d 100644
--- a/x-pack/plugins/canvas/public/components/font_picker/__stories__/__snapshots__/font_picker.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/font_picker/__stories__/__snapshots__/font_picker.stories.storyshot
@@ -43,7 +43,7 @@ exports[`Storyshots components/FontPicker default 1`] = `
           <span
             className="euiFormControlLayoutCustomIcon"
           >
-            <div
+            <span
               aria-hidden="true"
               className="euiFormControlLayoutCustomIcon__icon"
               data-euiicon-type="arrowDown"
@@ -118,7 +118,7 @@ exports[`Storyshots components/FontPicker with value 1`] = `
           <span
             className="euiFormControlLayoutCustomIcon"
           >
-            <div
+            <span
               aria-hidden="true"
               className="euiFormControlLayoutCustomIcon__icon"
               data-euiicon-type="arrowDown"
diff --git a/x-pack/plugins/canvas/public/components/item_grid/__stories__/__snapshots__/item_grid.stories.storyshot b/x-pack/plugins/canvas/public/components/item_grid/__stories__/__snapshots__/item_grid.stories.storyshot
index 4796cf9742dd9..dbb591582e909 100644
--- a/x-pack/plugins/canvas/public/components/item_grid/__stories__/__snapshots__/item_grid.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/item_grid/__stories__/__snapshots__/item_grid.stories.storyshot
@@ -70,7 +70,7 @@ exports[`Storyshots components/ItemGrid complex grid 1`] = `
         }
       }
     >
-      <div
+      <span
         color="#333"
         data-euiicon-type="plusInCircle"
       />
@@ -90,7 +90,7 @@ exports[`Storyshots components/ItemGrid complex grid 1`] = `
         }
       }
     >
-      <div
+      <span
         color="#FFF"
         data-euiicon-type="minusInCircle"
       />
@@ -110,7 +110,7 @@ exports[`Storyshots components/ItemGrid complex grid 1`] = `
         }
       }
     >
-      <div
+      <span
         color="#FFF"
         data-euiicon-type="check"
       />
@@ -123,13 +123,13 @@ exports[`Storyshots components/ItemGrid icon grid 1`] = `
 <div
   className="item-grid-row"
 >
-  <div
+  <span
     data-euiicon-type="plusInCircle"
   />
-  <div
+  <span
     data-euiicon-type="minusInCircle"
   />
-  <div
+  <span
     data-euiicon-type="check"
   />
 </div>
diff --git a/x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/__stories__/__snapshots__/keyboard_shortcuts_doc.stories.storyshot b/x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/__stories__/__snapshots__/keyboard_shortcuts_doc.stories.storyshot
index b435bbbb73495..e8b9d9d3ba881 100644
--- a/x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/__stories__/__snapshots__/keyboard_shortcuts_doc.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/__stories__/__snapshots__/keyboard_shortcuts_doc.stories.storyshot
@@ -16,7 +16,7 @@ exports[`Storyshots components/KeyboardShortcutsDoc default 1`] = `
       onClick={[Function]}
       type="button"
     >
-      <div
+      <span
         aria-hidden="true"
         className="euiButtonIcon__icon"
         data-euiicon-type="cross"
diff --git a/x-pack/plugins/canvas/public/components/palette_picker/__stories__/__snapshots__/palette_picker.stories.storyshot b/x-pack/plugins/canvas/public/components/palette_picker/__stories__/__snapshots__/palette_picker.stories.storyshot
index 978256e761db4..d5990d3dbfd53 100644
--- a/x-pack/plugins/canvas/public/components/palette_picker/__stories__/__snapshots__/palette_picker.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/palette_picker/__stories__/__snapshots__/palette_picker.stories.storyshot
@@ -52,7 +52,7 @@ exports[`Storyshots components/Color/PalettePicker clearable 1`] = `
             <span
               className="euiFormControlLayoutCustomIcon"
             >
-              <div
+              <span
                 aria-hidden="true"
                 className="euiFormControlLayoutCustomIcon__icon"
                 data-euiicon-type="arrowDown"
@@ -134,7 +134,7 @@ exports[`Storyshots components/Color/PalettePicker default 1`] = `
             <span
               className="euiFormControlLayoutCustomIcon"
             >
-              <div
+              <span
                 aria-hidden="true"
                 className="euiFormControlLayoutCustomIcon__icon"
                 data-euiicon-type="arrowDown"
@@ -216,7 +216,7 @@ exports[`Storyshots components/Color/PalettePicker interactive 1`] = `
             <span
               className="euiFormControlLayoutCustomIcon"
             >
-              <div
+              <span
                 aria-hidden="true"
                 className="euiFormControlLayoutCustomIcon__icon"
                 data-euiicon-type="arrowDown"
diff --git a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/element_controls.stories.storyshot b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/element_controls.stories.storyshot
index 408b0679c415f..6a20f1eef8da1 100644
--- a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/element_controls.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/element_controls.stories.storyshot
@@ -29,7 +29,7 @@ exports[`Storyshots components/SavedElementsModal/ElementControls has two button
           onFocus={[Function]}
           type="button"
         >
-          <div
+          <span
             aria-hidden="true"
             className="euiButtonIcon__icon"
             data-euiicon-type="pencil"
@@ -56,7 +56,7 @@ exports[`Storyshots components/SavedElementsModal/ElementControls has two button
           onFocus={[Function]}
           type="button"
         >
-          <div
+          <span
             aria-hidden="true"
             className="euiButtonIcon__icon"
             data-euiicon-type="trash"
diff --git a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/element_grid.stories.storyshot b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/element_grid.stories.storyshot
index f85fb7f18ce62..c7595364d6418 100644
--- a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/element_grid.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/element_grid.stories.storyshot
@@ -79,7 +79,7 @@ exports[`Storyshots components/SavedElementsModal/ElementGrid default 1`] = `
               onFocus={[Function]}
               type="button"
             >
-              <div
+              <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
                 data-euiicon-type="pencil"
@@ -106,7 +106,7 @@ exports[`Storyshots components/SavedElementsModal/ElementGrid default 1`] = `
               onFocus={[Function]}
               type="button"
             >
-              <div
+              <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
                 data-euiicon-type="trash"
@@ -185,7 +185,7 @@ exports[`Storyshots components/SavedElementsModal/ElementGrid default 1`] = `
               onFocus={[Function]}
               type="button"
             >
-              <div
+              <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
                 data-euiicon-type="pencil"
@@ -212,7 +212,7 @@ exports[`Storyshots components/SavedElementsModal/ElementGrid default 1`] = `
               onFocus={[Function]}
               type="button"
             >
-              <div
+              <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
                 data-euiicon-type="trash"
@@ -291,7 +291,7 @@ exports[`Storyshots components/SavedElementsModal/ElementGrid default 1`] = `
               onFocus={[Function]}
               type="button"
             >
-              <div
+              <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
                 data-euiicon-type="pencil"
@@ -318,7 +318,7 @@ exports[`Storyshots components/SavedElementsModal/ElementGrid default 1`] = `
               onFocus={[Function]}
               type="button"
             >
-              <div
+              <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
                 data-euiicon-type="trash"
diff --git a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/saved_elements_modal.stories.storyshot b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/saved_elements_modal.stories.storyshot
index 77e897e163618..24f6c7c8b349d 100644
--- a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/saved_elements_modal.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/saved_elements_modal.stories.storyshot
@@ -20,7 +20,7 @@ exports[`Storyshots components/SavedElementsModal no custom elements 1`] = `
       onClick={[Function]}
       type="button"
     >
-      <div
+      <span
         aria-hidden="true"
         className="euiButtonIcon__icon"
         data-euiicon-type="cross"
@@ -57,7 +57,7 @@ exports[`Storyshots components/SavedElementsModal no custom elements 1`] = `
               className="euiFormControlLayout__childrenWrapper"
             >
               <input
-                className="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch-isClearable"
+                className="euiFieldSearch euiFieldSearch--fullWidth"
                 onChange={[Function]}
                 onKeyUp={[Function]}
                 placeholder="Find element"
@@ -70,7 +70,7 @@ exports[`Storyshots components/SavedElementsModal no custom elements 1`] = `
                 <span
                   className="euiFormControlLayoutCustomIcon"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     className="euiFormControlLayoutCustomIcon__icon"
                     data-euiicon-type="search"
@@ -85,7 +85,7 @@ exports[`Storyshots components/SavedElementsModal no custom elements 1`] = `
           <div
             className="euiEmptyPrompt"
           >
-            <div
+            <span
               color="subdued"
               data-euiicon-type="vector"
               size="xxl"
@@ -160,7 +160,7 @@ exports[`Storyshots components/SavedElementsModal with custom elements 1`] = `
       onClick={[Function]}
       type="button"
     >
-      <div
+      <span
         aria-hidden="true"
         className="euiButtonIcon__icon"
         data-euiicon-type="cross"
@@ -197,7 +197,7 @@ exports[`Storyshots components/SavedElementsModal with custom elements 1`] = `
               className="euiFormControlLayout__childrenWrapper"
             >
               <input
-                className="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch-isClearable"
+                className="euiFieldSearch euiFieldSearch--fullWidth"
                 onChange={[Function]}
                 onKeyUp={[Function]}
                 placeholder="Find element"
@@ -210,7 +210,7 @@ exports[`Storyshots components/SavedElementsModal with custom elements 1`] = `
                 <span
                   className="euiFormControlLayoutCustomIcon"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     className="euiFormControlLayoutCustomIcon__icon"
                     data-euiicon-type="search"
@@ -293,7 +293,7 @@ exports[`Storyshots components/SavedElementsModal with custom elements 1`] = `
                       onFocus={[Function]}
                       type="button"
                     >
-                      <div
+                      <span
                         aria-hidden="true"
                         className="euiButtonIcon__icon"
                         data-euiicon-type="pencil"
@@ -320,7 +320,7 @@ exports[`Storyshots components/SavedElementsModal with custom elements 1`] = `
                       onFocus={[Function]}
                       type="button"
                     >
-                      <div
+                      <span
                         aria-hidden="true"
                         className="euiButtonIcon__icon"
                         data-euiicon-type="trash"
@@ -399,7 +399,7 @@ exports[`Storyshots components/SavedElementsModal with custom elements 1`] = `
                       onFocus={[Function]}
                       type="button"
                     >
-                      <div
+                      <span
                         aria-hidden="true"
                         className="euiButtonIcon__icon"
                         data-euiicon-type="pencil"
@@ -426,7 +426,7 @@ exports[`Storyshots components/SavedElementsModal with custom elements 1`] = `
                       onFocus={[Function]}
                       type="button"
                     >
-                      <div
+                      <span
                         aria-hidden="true"
                         className="euiButtonIcon__icon"
                         data-euiicon-type="trash"
@@ -505,7 +505,7 @@ exports[`Storyshots components/SavedElementsModal with custom elements 1`] = `
                       onFocus={[Function]}
                       type="button"
                     >
-                      <div
+                      <span
                         aria-hidden="true"
                         className="euiButtonIcon__icon"
                         data-euiicon-type="pencil"
@@ -532,7 +532,7 @@ exports[`Storyshots components/SavedElementsModal with custom elements 1`] = `
                       onFocus={[Function]}
                       type="button"
                     >
-                      <div
+                      <span
                         aria-hidden="true"
                         className="euiButtonIcon__icon"
                         data-euiicon-type="trash"
@@ -591,7 +591,7 @@ exports[`Storyshots components/SavedElementsModal with text filter 1`] = `
       onClick={[Function]}
       type="button"
     >
-      <div
+      <span
         aria-hidden="true"
         className="euiButtonIcon__icon"
         data-euiicon-type="cross"
@@ -641,7 +641,7 @@ exports[`Storyshots components/SavedElementsModal with text filter 1`] = `
                 <span
                   className="euiFormControlLayoutCustomIcon"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     className="euiFormControlLayoutCustomIcon__icon"
                     data-euiicon-type="search"
@@ -657,7 +657,7 @@ exports[`Storyshots components/SavedElementsModal with text filter 1`] = `
                   onClick={[Function]}
                   type="button"
                 >
-                  <div
+                  <span
                     className="euiFormControlLayoutClearButton__icon"
                     data-euiicon-type="cross"
                   />
@@ -739,7 +739,7 @@ exports[`Storyshots components/SavedElementsModal with text filter 1`] = `
                       onFocus={[Function]}
                       type="button"
                     >
-                      <div
+                      <span
                         aria-hidden="true"
                         className="euiButtonIcon__icon"
                         data-euiicon-type="pencil"
@@ -766,7 +766,7 @@ exports[`Storyshots components/SavedElementsModal with text filter 1`] = `
                       onFocus={[Function]}
                       type="button"
                     >
-                      <div
+                      <span
                         aria-hidden="true"
                         className="euiButtonIcon__icon"
                         data-euiicon-type="trash"
diff --git a/x-pack/plugins/canvas/public/components/sidebar_header/__stories__/__snapshots__/sidebar_header.stories.storyshot b/x-pack/plugins/canvas/public/components/sidebar_header/__stories__/__snapshots__/sidebar_header.stories.storyshot
index 16263aa7ea384..2e83f9fe155a2 100644
--- a/x-pack/plugins/canvas/public/components/sidebar_header/__stories__/__snapshots__/sidebar_header.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/sidebar_header/__stories__/__snapshots__/sidebar_header.stories.storyshot
@@ -67,7 +67,7 @@ exports[`Storyshots components/Sidebar/SidebarHeader with layer controls 1`] = `
               onFocus={[Function]}
               type="button"
             >
-              <div
+              <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
                 data-euiicon-type="sortUp"
@@ -93,7 +93,7 @@ exports[`Storyshots components/Sidebar/SidebarHeader with layer controls 1`] = `
               onFocus={[Function]}
               type="button"
             >
-              <div
+              <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
                 data-euiicon-type="arrowUp"
@@ -119,7 +119,7 @@ exports[`Storyshots components/Sidebar/SidebarHeader with layer controls 1`] = `
               onFocus={[Function]}
               type="button"
             >
-              <div
+              <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
                 data-euiicon-type="arrowDown"
@@ -145,7 +145,7 @@ exports[`Storyshots components/Sidebar/SidebarHeader with layer controls 1`] = `
               onFocus={[Function]}
               type="button"
             >
-              <div
+              <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
                 data-euiicon-type="sortDown"
diff --git a/x-pack/plugins/canvas/public/components/tag/__stories__/__snapshots__/tag.stories.storyshot b/x-pack/plugins/canvas/public/components/tag/__stories__/__snapshots__/tag.stories.storyshot
index 181d8b867edf0..6f88120fb2b84 100644
--- a/x-pack/plugins/canvas/public/components/tag/__stories__/__snapshots__/tag.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/tag/__stories__/__snapshots__/tag.stories.storyshot
@@ -54,7 +54,7 @@ exports[`Storyshots components/Tags/Tag as health 1`] = `
     <div
       className="euiFlexItem euiFlexItem--flexGrowZero"
     >
-      <div
+      <span
         color="#666666"
         data-euiicon-type="dot"
       />
@@ -78,7 +78,7 @@ exports[`Storyshots components/Tags/Tag as health with color 1`] = `
     <div
       className="euiFlexItem euiFlexItem--flexGrowZero"
     >
-      <div
+      <span
         color="#9b3067"
         data-euiicon-type="dot"
       />
diff --git a/x-pack/plugins/canvas/public/components/tag_list/__stories__/__snapshots__/tag_list.stories.storyshot b/x-pack/plugins/canvas/public/components/tag_list/__stories__/__snapshots__/tag_list.stories.storyshot
index ed431896f2f92..848b684795a82 100644
--- a/x-pack/plugins/canvas/public/components/tag_list/__stories__/__snapshots__/tag_list.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/tag_list/__stories__/__snapshots__/tag_list.stories.storyshot
@@ -75,7 +75,7 @@ Array [
       <div
         className="euiFlexItem euiFlexItem--flexGrowZero"
       >
-        <div
+        <span
           color="#cc3b54"
           data-euiicon-type="dot"
         />
@@ -96,7 +96,7 @@ Array [
       <div
         className="euiFlexItem euiFlexItem--flexGrowZero"
       >
-        <div
+        <span
           color="#9b3067"
           data-euiicon-type="dot"
         />
@@ -117,7 +117,7 @@ Array [
       <div
         className="euiFlexItem euiFlexItem--flexGrowZero"
       >
-        <div
+        <span
           color="#d41e93"
           data-euiicon-type="dot"
         />
diff --git a/x-pack/plugins/canvas/public/components/text_style_picker/__stories__/__snapshots__/text_style_picker.stories.storyshot b/x-pack/plugins/canvas/public/components/text_style_picker/__stories__/__snapshots__/text_style_picker.stories.storyshot
index 177e6fb67af90..e206ad428a7e9 100644
--- a/x-pack/plugins/canvas/public/components/text_style_picker/__stories__/__snapshots__/text_style_picker.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/text_style_picker/__stories__/__snapshots__/text_style_picker.stories.storyshot
@@ -59,7 +59,7 @@ exports[`Storyshots components/TextStylePicker default 1`] = `
                   <span
                     className="euiFormControlLayoutCustomIcon"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       className="euiFormControlLayoutCustomIcon__icon"
                       data-euiicon-type="arrowDown"
@@ -188,7 +188,7 @@ exports[`Storyshots components/TextStylePicker default 1`] = `
               <span
                 className="euiFormControlLayoutCustomIcon"
               >
-                <div
+                <span
                   aria-hidden="true"
                   className="euiFormControlLayoutCustomIcon__icon"
                   data-euiicon-type="arrowDown"
@@ -280,7 +280,7 @@ exports[`Storyshots components/TextStylePicker default 1`] = `
                 <span
                   className="euiButtonContent euiButton__content"
                 >
-                  <div
+                  <span
                     className="euiButtonContent__icon"
                     data-euiicon-type="editorBold"
                     size="m"
@@ -313,7 +313,7 @@ exports[`Storyshots components/TextStylePicker default 1`] = `
                 <span
                   className="euiButtonContent euiButton__content"
                 >
-                  <div
+                  <span
                     className="euiButtonContent__icon"
                     data-euiicon-type="editorItalic"
                     size="m"
@@ -346,7 +346,7 @@ exports[`Storyshots components/TextStylePicker default 1`] = `
                 <span
                   className="euiButtonContent euiButton__content"
                 >
-                  <div
+                  <span
                     className="euiButtonContent__icon"
                     data-euiicon-type="editorUnderline"
                     size="m"
@@ -391,7 +391,7 @@ exports[`Storyshots components/TextStylePicker default 1`] = `
                 <span
                   className="euiButtonContent euiButton__content"
                 >
-                  <div
+                  <span
                     className="euiButtonContent__icon"
                     data-euiicon-type="editorAlignLeft"
                     size="m"
@@ -424,7 +424,7 @@ exports[`Storyshots components/TextStylePicker default 1`] = `
                 <span
                   className="euiButtonContent euiButton__content"
                 >
-                  <div
+                  <span
                     className="euiButtonContent__icon"
                     data-euiicon-type="editorAlignCenter"
                     size="m"
@@ -457,7 +457,7 @@ exports[`Storyshots components/TextStylePicker default 1`] = `
                 <span
                   className="euiButtonContent euiButton__content"
                 >
-                  <div
+                  <span
                     className="euiButtonContent__icon"
                     data-euiicon-type="editorAlignRight"
                     size="m"
@@ -537,7 +537,7 @@ exports[`Storyshots components/TextStylePicker interactive 1`] = `
                   <span
                     className="euiFormControlLayoutCustomIcon"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       className="euiFormControlLayoutCustomIcon__icon"
                       data-euiicon-type="arrowDown"
@@ -666,7 +666,7 @@ exports[`Storyshots components/TextStylePicker interactive 1`] = `
               <span
                 className="euiFormControlLayoutCustomIcon"
               >
-                <div
+                <span
                   aria-hidden="true"
                   className="euiFormControlLayoutCustomIcon__icon"
                   data-euiicon-type="arrowDown"
@@ -758,7 +758,7 @@ exports[`Storyshots components/TextStylePicker interactive 1`] = `
                 <span
                   className="euiButtonContent euiButton__content"
                 >
-                  <div
+                  <span
                     className="euiButtonContent__icon"
                     data-euiicon-type="editorBold"
                     size="m"
@@ -791,7 +791,7 @@ exports[`Storyshots components/TextStylePicker interactive 1`] = `
                 <span
                   className="euiButtonContent euiButton__content"
                 >
-                  <div
+                  <span
                     className="euiButtonContent__icon"
                     data-euiicon-type="editorItalic"
                     size="m"
@@ -824,7 +824,7 @@ exports[`Storyshots components/TextStylePicker interactive 1`] = `
                 <span
                   className="euiButtonContent euiButton__content"
                 >
-                  <div
+                  <span
                     className="euiButtonContent__icon"
                     data-euiicon-type="editorUnderline"
                     size="m"
@@ -869,7 +869,7 @@ exports[`Storyshots components/TextStylePicker interactive 1`] = `
                 <span
                   className="euiButtonContent euiButton__content"
                 >
-                  <div
+                  <span
                     className="euiButtonContent__icon"
                     data-euiicon-type="editorAlignLeft"
                     size="m"
@@ -902,7 +902,7 @@ exports[`Storyshots components/TextStylePicker interactive 1`] = `
                 <span
                   className="euiButtonContent euiButton__content"
                 >
-                  <div
+                  <span
                     className="euiButtonContent__icon"
                     data-euiicon-type="editorAlignCenter"
                     size="m"
@@ -935,7 +935,7 @@ exports[`Storyshots components/TextStylePicker interactive 1`] = `
                 <span
                   className="euiButtonContent euiButton__content"
                 >
-                  <div
+                  <span
                     className="euiButtonContent__icon"
                     data-euiicon-type="editorAlignRight"
                     size="m"
diff --git a/x-pack/plugins/canvas/public/components/toolbar/__stories__/__snapshots__/toolbar.stories.storyshot b/x-pack/plugins/canvas/public/components/toolbar/__stories__/__snapshots__/toolbar.stories.storyshot
index 96f9a9ae183c8..6f2a4a17468ff 100644
--- a/x-pack/plugins/canvas/public/components/toolbar/__stories__/__snapshots__/toolbar.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/toolbar/__stories__/__snapshots__/toolbar.stories.storyshot
@@ -21,7 +21,7 @@ exports[`Storyshots components/Toolbar element selected 1`] = `
           <span
             className="euiButtonContent euiButtonEmpty__content"
           >
-            <div
+            <span
               className="euiButtonContent__icon"
               data-euiicon-type="grid"
               size="m"
@@ -47,7 +47,7 @@ exports[`Storyshots components/Toolbar element selected 1`] = `
           onClick={[Function]}
           type="button"
         >
-          <div
+          <span
             aria-hidden="true"
             className="euiButtonIcon__icon"
             data-euiicon-type="arrowLeft"
@@ -84,7 +84,7 @@ exports[`Storyshots components/Toolbar element selected 1`] = `
           onClick={[Function]}
           type="button"
         >
-          <div
+          <span
             aria-hidden="true"
             className="euiButtonIcon__icon"
             data-euiicon-type="arrowRight"
@@ -107,7 +107,7 @@ exports[`Storyshots components/Toolbar element selected 1`] = `
           <span
             className="euiButtonContent euiButtonEmpty__content"
           >
-            <div
+            <span
               className="euiButtonContent__icon"
               data-euiicon-type="editorCodeBlock"
               size="m"
@@ -146,7 +146,7 @@ exports[`Storyshots components/Toolbar no element selected 1`] = `
           <span
             className="euiButtonContent euiButtonEmpty__content"
           >
-            <div
+            <span
               className="euiButtonContent__icon"
               data-euiicon-type="grid"
               size="m"
@@ -172,7 +172,7 @@ exports[`Storyshots components/Toolbar no element selected 1`] = `
           onClick={[Function]}
           type="button"
         >
-          <div
+          <span
             aria-hidden="true"
             className="euiButtonIcon__icon"
             data-euiicon-type="arrowLeft"
@@ -209,7 +209,7 @@ exports[`Storyshots components/Toolbar no element selected 1`] = `
           onClick={[Function]}
           type="button"
         >
-          <div
+          <span
             aria-hidden="true"
             className="euiButtonIcon__icon"
             data-euiicon-type="arrowRight"
diff --git a/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/delete_var.stories.storyshot b/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/delete_var.stories.storyshot
index aed7979fe7237..f1fac7e6ce477 100644
--- a/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/delete_var.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/delete_var.stories.storyshot
@@ -13,7 +13,7 @@ Array [
       <span
         className="canvasVarHeader__iconWrapper"
       >
-        <div
+        <span
           data-euiicon-type="sortLeft"
           style={
             Object {
@@ -69,7 +69,7 @@ Array [
             <span
               className="euiButtonContent euiButton__content"
             >
-              <div
+              <span
                 className="euiButtonContent__icon"
                 data-euiicon-type="trash"
                 size="m"
diff --git a/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/edit_var.stories.storyshot b/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/edit_var.stories.storyshot
index 841d7612b4c27..2036c6da81ebb 100644
--- a/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/edit_var.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/edit_var.stories.storyshot
@@ -13,7 +13,7 @@ Array [
       <span
         className="canvasVarHeader__iconWrapper"
       >
-        <div
+        <span
           data-euiicon-type="sortLeft"
           style={
             Object {
@@ -41,7 +41,7 @@ Array [
         <div
           className="euiCallOutHeader"
         >
-          <div
+          <span
             aria-hidden="true"
             className="euiCallOutHeader__icon"
             data-euiicon-type="alert"
@@ -112,7 +112,7 @@ Array [
                         className="euiToken euiToken--euiColorVis7 euiToken--square euiToken--light euiToken--small canvasEditVar__tokenIcon"
                         style={Object {}}
                       >
-                        <div
+                        <span
                           data-euiicon-type="tokenBoolean"
                           size="m"
                         />
@@ -141,7 +141,7 @@ Array [
                         className="euiToken euiToken--euiColorVis7 euiToken--square euiToken--light euiToken--small canvasEditVar__tokenIcon"
                         style={Object {}}
                       >
-                        <div
+                        <span
                           data-euiicon-type="tokenBoolean"
                           size="m"
                         />
@@ -158,7 +158,7 @@ Array [
                     <span
                       className="euiFormControlLayoutCustomIcon"
                     >
-                      <div
+                      <span
                         aria-hidden="true"
                         className="euiFormControlLayoutCustomIcon__icon"
                         data-euiicon-type="arrowDown"
@@ -312,7 +312,7 @@ Array [
             <span
               className="euiButtonContent euiButton__content"
             >
-              <div
+              <span
                 className="euiButtonContent__icon"
                 data-euiicon-type="save"
                 size="m"
@@ -363,7 +363,7 @@ Array [
       <span
         className="canvasVarHeader__iconWrapper"
       >
-        <div
+        <span
           data-euiicon-type="sortLeft"
           style={
             Object {
@@ -391,7 +391,7 @@ Array [
         <div
           className="euiCallOutHeader"
         >
-          <div
+          <span
             aria-hidden="true"
             className="euiCallOutHeader__icon"
             data-euiicon-type="alert"
@@ -462,7 +462,7 @@ Array [
                         className="euiToken euiToken--euiColorVis0 euiToken--square euiToken--light euiToken--small canvasEditVar__tokenIcon"
                         style={Object {}}
                       >
-                        <div
+                        <span
                           data-euiicon-type="tokenNumber"
                           size="m"
                         />
@@ -491,7 +491,7 @@ Array [
                         className="euiToken euiToken--euiColorVis0 euiToken--square euiToken--light euiToken--small canvasEditVar__tokenIcon"
                         style={Object {}}
                       >
-                        <div
+                        <span
                           data-euiicon-type="tokenNumber"
                           size="m"
                         />
@@ -508,7 +508,7 @@ Array [
                     <span
                       className="euiFormControlLayoutCustomIcon"
                     >
-                      <div
+                      <span
                         aria-hidden="true"
                         className="euiFormControlLayoutCustomIcon__icon"
                         data-euiicon-type="arrowDown"
@@ -611,7 +611,7 @@ Array [
             <span
               className="euiButtonContent euiButton__content"
             >
-              <div
+              <span
                 className="euiButtonContent__icon"
                 data-euiicon-type="save"
                 size="m"
@@ -662,7 +662,7 @@ Array [
       <span
         className="canvasVarHeader__iconWrapper"
       >
-        <div
+        <span
           data-euiicon-type="sortLeft"
           style={
             Object {
@@ -690,7 +690,7 @@ Array [
         <div
           className="euiCallOutHeader"
         >
-          <div
+          <span
             aria-hidden="true"
             className="euiCallOutHeader__icon"
             data-euiicon-type="alert"
@@ -761,7 +761,7 @@ Array [
                         className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--small canvasEditVar__tokenIcon"
                         style={Object {}}
                       >
-                        <div
+                        <span
                           data-euiicon-type="tokenString"
                           size="m"
                         />
@@ -790,7 +790,7 @@ Array [
                         className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--small canvasEditVar__tokenIcon"
                         style={Object {}}
                       >
-                        <div
+                        <span
                           data-euiicon-type="tokenString"
                           size="m"
                         />
@@ -807,7 +807,7 @@ Array [
                     <span
                       className="euiFormControlLayoutCustomIcon"
                     >
-                      <div
+                      <span
                         aria-hidden="true"
                         className="euiFormControlLayoutCustomIcon__icon"
                         data-euiicon-type="arrowDown"
@@ -910,7 +910,7 @@ Array [
             <span
               className="euiButtonContent euiButton__content"
             >
-              <div
+              <span
                 className="euiButtonContent__icon"
                 data-euiicon-type="save"
                 size="m"
@@ -961,7 +961,7 @@ Array [
       <span
         className="canvasVarHeader__iconWrapper"
       >
-        <div
+        <span
           data-euiicon-type="sortLeft"
           style={
             Object {
@@ -1036,7 +1036,7 @@ Array [
                         className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--small canvasEditVar__tokenIcon"
                         style={Object {}}
                       >
-                        <div
+                        <span
                           data-euiicon-type="tokenString"
                           size="m"
                         />
@@ -1065,7 +1065,7 @@ Array [
                         className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--small canvasEditVar__tokenIcon"
                         style={Object {}}
                       >
-                        <div
+                        <span
                           data-euiicon-type="tokenString"
                           size="m"
                         />
@@ -1082,7 +1082,7 @@ Array [
                     <span
                       className="euiFormControlLayoutCustomIcon"
                     >
-                      <div
+                      <span
                         aria-hidden="true"
                         className="euiFormControlLayoutCustomIcon__icon"
                         data-euiicon-type="arrowDown"
@@ -1185,7 +1185,7 @@ Array [
             <span
               className="euiButtonContent euiButton__content"
             >
-              <div
+              <span
                 className="euiButtonContent__icon"
                 data-euiicon-type="save"
                 size="m"
diff --git a/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/var_config.stories.storyshot b/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/var_config.stories.storyshot
index b4996328b04e7..bcdd5464e98c5 100644
--- a/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/var_config.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/var_config.stories.storyshot
@@ -24,7 +24,7 @@ exports[`Storyshots components/Variables/VarConfig default 1`] = `
           <span
             className="euiAccordion__iconWrapper"
           >
-            <div
+            <span
               className="euiAccordion__icon"
               data-euiicon-type="arrowRight"
               size="m"
@@ -65,7 +65,7 @@ exports[`Storyshots components/Variables/VarConfig default 1`] = `
               onFocus={[Function]}
               type="button"
             >
-              <div
+              <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
                 data-euiicon-type="plusInCircle"
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/element_menu/__stories__/__snapshots__/element_menu.stories.storyshot b/x-pack/plugins/canvas/public/components/workpad_header/element_menu/__stories__/__snapshots__/element_menu.stories.storyshot
index 68bf0ecccbe56..6bce2be335b78 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/element_menu/__stories__/__snapshots__/element_menu.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/workpad_header/element_menu/__stories__/__snapshots__/element_menu.stories.storyshot
@@ -22,7 +22,7 @@ exports[`Storyshots components/WorkpadHeader/ElementMenu default 1`] = `
       <span
         className="euiButtonContent euiButton__content"
       >
-        <div
+        <span
           className="euiButtonContent__icon"
           data-euiicon-type="plusInCircle"
           size="m"
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/__stories__/__snapshots__/pdf_panel.stories.storyshot b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/__stories__/__snapshots__/pdf_panel.stories.storyshot
index 517a93f4e6db3..11085c2d53872 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/share_menu/__stories__/__snapshots__/pdf_panel.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/workpad_header/share_menu/__stories__/__snapshots__/pdf_panel.stories.storyshot
@@ -70,7 +70,7 @@ exports[`Storyshots components/WorkpadHeader/ShareMenu/PDFPanel default 1`] = `
         <span
           className="euiButtonContent euiButton__content"
         >
-          <div
+          <span
             className="euiButtonContent__icon"
             data-euiicon-type="copy"
             size="m"
diff --git a/x-pack/plugins/canvas/public/components/workpad_templates/examples/__snapshots__/workpad_templates.stories.storyshot b/x-pack/plugins/canvas/public/components/workpad_templates/examples/__snapshots__/workpad_templates.stories.storyshot
index 52a009f1d5cbf..50664789eddae 100644
--- a/x-pack/plugins/canvas/public/components/workpad_templates/examples/__snapshots__/workpad_templates.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/workpad_templates/examples/__snapshots__/workpad_templates.stories.storyshot
@@ -22,7 +22,7 @@ exports[`Storyshots components/WorkpadTemplates default 1`] = `
         >
           <input
             aria-label="This is a search bar. As you type, the results lower in the page will automatically filter."
-            className="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch-isClearable"
+            className="euiFieldSearch euiFieldSearch--fullWidth"
             defaultValue=""
             onKeyUp={[Function]}
             placeholder="Find template"
@@ -34,7 +34,7 @@ exports[`Storyshots components/WorkpadTemplates default 1`] = `
             <span
               className="euiFormControlLayoutCustomIcon"
             >
-              <div
+              <span
                 aria-hidden="true"
                 className="euiFormControlLayoutCustomIcon__icon"
                 data-euiicon-type="search"
@@ -70,7 +70,7 @@ exports[`Storyshots components/WorkpadTemplates default 1`] = `
               <span
                 className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
               >
-                <div
+                <span
                   className="euiButtonContent__icon"
                   data-euiicon-type="arrowDown"
                   size="m"
@@ -134,7 +134,7 @@ exports[`Storyshots components/WorkpadTemplates default 1`] = `
                     <span
                       className="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                     >
-                      <div
+                      <span
                         className="euiButtonContent__icon"
                         data-euiicon-type="arrowDown"
                         size="m"
@@ -194,7 +194,7 @@ exports[`Storyshots components/WorkpadTemplates default 1`] = `
                   >
                     Template name
                   </span>
-                  <div
+                  <span
                     aria-label="Sorted in ascending order"
                     className="euiTableSortIcon"
                     data-euiicon-type="sortUp"
@@ -338,7 +338,7 @@ exports[`Storyshots components/WorkpadTemplates default 1`] = `
                     <div
                       className="euiFlexItem euiFlexItem--flexGrowZero"
                     >
-                      <div
+                      <span
                         color="#666666"
                         data-euiicon-type="dot"
                       />
@@ -359,7 +359,7 @@ exports[`Storyshots components/WorkpadTemplates default 1`] = `
                     <div
                       className="euiFlexItem euiFlexItem--flexGrowZero"
                     >
-                      <div
+                      <span
                         color="#666666"
                         data-euiicon-type="dot"
                       />
@@ -459,7 +459,7 @@ exports[`Storyshots components/WorkpadTemplates default 1`] = `
                     <div
                       className="euiFlexItem euiFlexItem--flexGrowZero"
                     >
-                      <div
+                      <span
                         color="#666666"
                         data-euiicon-type="dot"
                       />
@@ -480,7 +480,7 @@ exports[`Storyshots components/WorkpadTemplates default 1`] = `
                     <div
                       className="euiFlexItem euiFlexItem--flexGrowZero"
                     >
-                      <div
+                      <span
                         color="#666666"
                         data-euiicon-type="dot"
                       />
@@ -519,7 +519,7 @@ exports[`Storyshots components/WorkpadTemplates default 1`] = `
           onClick={[Function]}
           type="button"
         >
-          <div
+          <span
             aria-hidden="true"
             className="euiButtonIcon__icon"
             data-euiicon-type="arrowLeft"
@@ -561,7 +561,7 @@ exports[`Storyshots components/WorkpadTemplates default 1`] = `
           onClick={[Function]}
           type="button"
         >
-          <div
+          <span
             aria-hidden="true"
             className="euiButtonIcon__icon"
             data-euiicon-type="arrowRight"
diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__stories__/__snapshots__/extended_template.stories.storyshot b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__stories__/__snapshots__/extended_template.stories.storyshot
index 0f4963c076757..755cfc343eef0 100644
--- a/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__stories__/__snapshots__/extended_template.stories.storyshot
+++ b/x-pack/plugins/canvas/public/expression_types/arg_types/container_style/__stories__/__snapshots__/extended_template.stories.storyshot
@@ -138,7 +138,7 @@ exports[`Storyshots arguments/ContainerStyle extended 1`] = `
                   <span
                     className="euiFormControlLayoutCustomIcon"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       className="euiFormControlLayoutCustomIcon__icon"
                       data-euiicon-type="arrowDown"
@@ -202,7 +202,7 @@ exports[`Storyshots arguments/ContainerStyle extended 1`] = `
                   <span
                     className="euiFormControlLayoutCustomIcon"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       className="euiFormControlLayoutCustomIcon__icon"
                       data-euiicon-type="arrowDown"
@@ -354,7 +354,7 @@ exports[`Storyshots arguments/ContainerStyle extended 1`] = `
                       <span
                         className="euiFormControlLayoutCustomIcon"
                       >
-                        <div
+                        <span
                           aria-hidden="true"
                           className="euiFormControlLayoutCustomIcon__icon"
                           data-euiicon-type="arrowDown"
@@ -608,7 +608,7 @@ exports[`Storyshots arguments/ContainerStyle/components appearance form 1`] = `
                 <span
                   className="euiFormControlLayoutCustomIcon"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     className="euiFormControlLayoutCustomIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -672,7 +672,7 @@ exports[`Storyshots arguments/ContainerStyle/components appearance form 1`] = `
                 <span
                   className="euiFormControlLayoutCustomIcon"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     className="euiFormControlLayoutCustomIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -823,7 +823,7 @@ exports[`Storyshots arguments/ContainerStyle/components border form 1`] = `
                     <span
                       className="euiFormControlLayoutCustomIcon"
                     >
-                      <div
+                      <span
                         aria-hidden="true"
                         className="euiFormControlLayoutCustomIcon__icon"
                         data-euiicon-type="arrowDown"
@@ -1088,7 +1088,7 @@ exports[`Storyshots arguments/ContainerStyle/components extended template 1`] =
                   <span
                     className="euiFormControlLayoutCustomIcon"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       className="euiFormControlLayoutCustomIcon__icon"
                       data-euiicon-type="arrowDown"
@@ -1152,7 +1152,7 @@ exports[`Storyshots arguments/ContainerStyle/components extended template 1`] =
                   <span
                     className="euiFormControlLayoutCustomIcon"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       className="euiFormControlLayoutCustomIcon__icon"
                       data-euiicon-type="arrowDown"
@@ -1304,7 +1304,7 @@ exports[`Storyshots arguments/ContainerStyle/components extended template 1`] =
                       <span
                         className="euiFormControlLayoutCustomIcon"
                       >
-                        <div
+                        <span
                           aria-hidden="true"
                           className="euiFormControlLayoutCustomIcon__icon"
                           data-euiicon-type="arrowDown"
diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__stories__/__snapshots__/extended_template.stories.storyshot b/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__stories__/__snapshots__/extended_template.stories.storyshot
index 4dbcc1bb33045..5d666282f9d0e 100644
--- a/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__stories__/__snapshots__/extended_template.stories.storyshot
+++ b/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__stories__/__snapshots__/extended_template.stories.storyshot
@@ -65,7 +65,7 @@ exports[`Storyshots arguments/SeriesStyle extended 1`] = `
               <span
                 className="euiFormControlLayoutCustomIcon"
               >
-                <div
+                <span
                   aria-hidden="true"
                   className="euiFormControlLayoutCustomIcon__icon"
                   data-euiicon-type="arrowDown"
@@ -157,7 +157,7 @@ exports[`Storyshots arguments/SeriesStyle extended 1`] = `
                   <span
                     className="euiFormControlLayoutCustomIcon"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       className="euiFormControlLayoutCustomIcon__icon"
                       data-euiicon-type="arrowDown"
@@ -241,7 +241,7 @@ exports[`Storyshots arguments/SeriesStyle extended 1`] = `
                   <span
                     className="euiFormControlLayoutCustomIcon"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       className="euiFormControlLayoutCustomIcon__icon"
                       data-euiicon-type="arrowDown"
@@ -325,7 +325,7 @@ exports[`Storyshots arguments/SeriesStyle extended 1`] = `
                   <span
                     className="euiFormControlLayoutCustomIcon"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       className="euiFormControlLayoutCustomIcon__icon"
                       data-euiicon-type="arrowDown"
diff --git a/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__stories__/__snapshots__/simple_template.stories.storyshot b/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__stories__/__snapshots__/simple_template.stories.storyshot
index b242d90cd7361..5f33f01ced927 100644
--- a/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__stories__/__snapshots__/simple_template.stories.storyshot
+++ b/x-pack/plugins/canvas/public/expression_types/arg_types/series_style/__stories__/__snapshots__/simple_template.stories.storyshot
@@ -212,7 +212,7 @@ exports[`Storyshots arguments/SeriesStyle/components simple: no series 1`] = `
           onMouseOut={[Function]}
           onMouseOver={[Function]}
         >
-          <div
+          <span
             aria-label="Info"
             color="warning"
             data-euiicon-type="alert"
diff --git a/x-pack/plugins/canvas/shareable_runtime/api/__tests__/__snapshots__/shareable.test.tsx.snap b/x-pack/plugins/canvas/shareable_runtime/api/__tests__/__snapshots__/shareable.test.tsx.snap
index 1f53fbce6537f..a2d8d03aebce4 100644
--- a/x-pack/plugins/canvas/shareable_runtime/api/__tests__/__snapshots__/shareable.test.tsx.snap
+++ b/x-pack/plugins/canvas/shareable_runtime/api/__tests__/__snapshots__/shareable.test.tsx.snap
@@ -9,7 +9,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with default propertie
 </style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 720px; width: 1080px; transform: scale3d(0.1388888888888889, 0.1388888888888889, 1);\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute; transform: matrix3d(1,0,0,0,0,1,0,0,0,0,1,0,540,367,1,1);\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
-</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"flex-shrink: 0;\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><div data-euiicon-type=\\"logoElastic\\"></div></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><div data-euiicon-type=\\"arrowLeft\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><div data-euiicon-type=\\"arrowRight\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><div data-euiicon-type=\\"gear\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button></div></div></div></div></div></div></div></div></div></div></div>"
+</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"flex-shrink: 0;\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><span data-euiicon-type=\\"logoElastic\\"></span></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><span data-euiicon-type=\\"arrowLeft\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><span data-euiicon-type=\\"arrowRight\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><span data-euiicon-type=\\"gear\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div></div></div></div></div></div></div></div></div></div></div>"
 `;
 
 exports[`Canvas Shareable Workpad API Placed successfully with height specified 1`] = `"<div kbn-canvas-shareable=\\"canvas\\" kbn-canvas-height=\\"350\\" kbn-canvas-url=\\"workpad.json\\"></div>"`;
@@ -21,7 +21,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with height specified
 </style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 720px; width: 1080px; transform: scale3d(0.1388888888888889, 0.1388888888888889, 1);\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute; transform: matrix3d(1,0,0,0,0,1,0,0,0,0,1,0,540,367,1,1);\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
-</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"flex-shrink: 0;\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><div data-euiicon-type=\\"logoElastic\\"></div></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><div data-euiicon-type=\\"arrowLeft\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><div data-euiicon-type=\\"arrowRight\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><div data-euiicon-type=\\"gear\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button></div></div></div></div></div></div></div></div></div></div></div>"
+</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"flex-shrink: 0;\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><span data-euiicon-type=\\"logoElastic\\"></span></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><span data-euiicon-type=\\"arrowLeft\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><span data-euiicon-type=\\"arrowRight\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><span data-euiicon-type=\\"gear\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div></div></div></div></div></div></div></div></div></div></div>"
 `;
 
 exports[`Canvas Shareable Workpad API Placed successfully with page specified 1`] = `"<div kbn-canvas-shareable=\\"canvas\\" kbn-canvas-page=\\"0\\" kbn-canvas-url=\\"workpad.json\\"></div>"`;
@@ -33,7 +33,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with page specified 2`
 </style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 720px; width: 1080px; transform: scale3d(0.1388888888888889, 0.1388888888888889, 1);\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute; transform: matrix3d(1,0,0,0,0,1,0,0,0,0,1,0,540,367,1,1);\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
-</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"flex-shrink: 0;\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><div data-euiicon-type=\\"logoElastic\\"></div></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><div data-euiicon-type=\\"arrowLeft\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><div data-euiicon-type=\\"arrowRight\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><div data-euiicon-type=\\"gear\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button></div></div></div></div></div></div></div></div></div></div></div>"
+</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"flex-shrink: 0;\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><span data-euiicon-type=\\"logoElastic\\"></span></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><span data-euiicon-type=\\"arrowLeft\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><span data-euiicon-type=\\"arrowRight\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><span data-euiicon-type=\\"gear\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div></div></div></div></div></div></div></div></div></div></div>"
 `;
 
 exports[`Canvas Shareable Workpad API Placed successfully with width and height specified 1`] = `"<div kbn-canvas-shareable=\\"canvas\\" kbn-canvas-width=\\"350\\" kbn-canvas-height=\\"350\\" kbn-canvas-url=\\"workpad.json\\"></div>"`;
@@ -45,7 +45,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with width and height
 </style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 720px; width: 1080px; transform: scale3d(0.1388888888888889, 0.1388888888888889, 1);\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute; transform: matrix3d(1,0,0,0,0,1,0,0,0,0,1,0,540,367,1,1);\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
-</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"flex-shrink: 0;\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><div data-euiicon-type=\\"logoElastic\\"></div></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><div data-euiicon-type=\\"arrowLeft\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><div data-euiicon-type=\\"arrowRight\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><div data-euiicon-type=\\"gear\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button></div></div></div></div></div></div></div></div></div></div></div>"
+</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"flex-shrink: 0;\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><span data-euiicon-type=\\"logoElastic\\"></span></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><span data-euiicon-type=\\"arrowLeft\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><span data-euiicon-type=\\"arrowRight\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><span data-euiicon-type=\\"gear\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div></div></div></div></div></div></div></div></div></div></div>"
 `;
 
 exports[`Canvas Shareable Workpad API Placed successfully with width specified 1`] = `"<div kbn-canvas-shareable=\\"canvas\\" kbn-canvas-width=\\"400\\" kbn-canvas-url=\\"workpad.json\\"></div>"`;
@@ -57,5 +57,5 @@ exports[`Canvas Shareable Workpad API Placed successfully with width specified 2
 </style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 720px; width: 1080px; transform: scale3d(0.1388888888888889, 0.1388888888888889, 1);\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute; transform: matrix3d(1,0,0,0,0,1,0,0,0,0,1,0,540,367,1,1);\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
-</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"flex-shrink: 0;\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><div data-euiicon-type=\\"logoElastic\\"></div></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><div data-euiicon-type=\\"arrowLeft\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><div data-euiicon-type=\\"arrowRight\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><div data-euiicon-type=\\"gear\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button></div></div></div></div></div></div></div></div></div></div></div>"
+</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"flex-shrink: 0;\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><span data-euiicon-type=\\"logoElastic\\"></span></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><span data-euiicon-type=\\"arrowLeft\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><span data-euiicon-type=\\"arrowRight\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><span data-euiicon-type=\\"gear\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div></div></div></div></div></div></div></div></div></div></div>"
 `;
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/__stories__/__snapshots__/canvas.stories.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/__stories__/__snapshots__/canvas.stories.storyshot
index e0970b57ed971..73d350a9c1ee1 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/__stories__/__snapshots__/canvas.stories.storyshot
+++ b/x-pack/plugins/canvas/shareable_runtime/components/__stories__/__snapshots__/canvas.stories.storyshot
@@ -1324,7 +1324,7 @@ exports[`Storyshots shareables/Canvas component 1`] = `
                   rel=""
                   title="Powered by Elastic.co"
                 >
-                  <div
+                  <span
                     data-euiicon-type="logoElastic"
                     size="l"
                   />
@@ -1380,7 +1380,7 @@ exports[`Storyshots shareables/Canvas component 1`] = `
                     onClick={[Function]}
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       className="euiButtonIcon__icon"
                       data-euiicon-type="arrowLeft"
@@ -1429,7 +1429,7 @@ exports[`Storyshots shareables/Canvas component 1`] = `
                     onClick={[Function]}
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       className="euiButtonIcon__icon"
                       data-euiicon-type="arrowRight"
@@ -1462,7 +1462,7 @@ exports[`Storyshots shareables/Canvas component 1`] = `
                         onClick={[Function]}
                         type="button"
                       >
-                        <div
+                        <span
                           aria-hidden="true"
                           className="euiButtonIcon__icon"
                           data-euiicon-type="gear"
@@ -2806,7 +2806,7 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
                   rel=""
                   title="Powered by Elastic.co"
                 >
-                  <div
+                  <span
                     data-euiicon-type="logoElastic"
                     size="l"
                   />
@@ -2862,7 +2862,7 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
                     onClick={[Function]}
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       className="euiButtonIcon__icon"
                       data-euiicon-type="arrowLeft"
@@ -2911,7 +2911,7 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
                     onClick={[Function]}
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       className="euiButtonIcon__icon"
                       data-euiicon-type="arrowRight"
@@ -2944,7 +2944,7 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
                         onClick={[Function]}
                         type="button"
                       >
-                        <div
+                        <span
                           aria-hidden="true"
                           className="euiButtonIcon__icon"
                           data-euiicon-type="gear"
@@ -3104,7 +3104,7 @@ exports[`Storyshots shareables/Canvas contextual: hello 1`] = `
                   rel=""
                   title="Powered by Elastic.co"
                 >
-                  <div
+                  <span
                     data-euiicon-type="logoElastic"
                     size="l"
                   />
@@ -3160,7 +3160,7 @@ exports[`Storyshots shareables/Canvas contextual: hello 1`] = `
                     onClick={[Function]}
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       className="euiButtonIcon__icon"
                       data-euiicon-type="arrowLeft"
@@ -3208,7 +3208,7 @@ exports[`Storyshots shareables/Canvas contextual: hello 1`] = `
                     onClick={[Function]}
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       className="euiButtonIcon__icon"
                       data-euiicon-type="arrowRight"
@@ -3241,7 +3241,7 @@ exports[`Storyshots shareables/Canvas contextual: hello 1`] = `
                         onClick={[Function]}
                         type="button"
                       >
-                        <div
+                        <span
                           aria-hidden="true"
                           className="euiButtonIcon__icon"
                           data-euiicon-type="gear"
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/__tests__/__snapshots__/app.test.tsx.snap b/x-pack/plugins/canvas/shareable_runtime/components/__tests__/__snapshots__/app.test.tsx.snap
index 6d906abebdb52..bcfbe95f538dc 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/__tests__/__snapshots__/app.test.tsx.snap
+++ b/x-pack/plugins/canvas/shareable_runtime/components/__tests__/__snapshots__/app.test.tsx.snap
@@ -7,5 +7,5 @@ exports[`<App /> App renders properly 1`] = `
 </style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 720px; width: 1080px; transform: scale3d(0.1388888888888889, 0.1388888888888889, 1);\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute; transform: matrix3d(1,0,0,0,0,1,0,0,0,0,1,0,540,367,1,1);\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
-</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"flex-shrink: 0;\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><div data-euiicon-type=\\"logoElastic\\"></div></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><div data-euiicon-type=\\"arrowLeft\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><div data-euiicon-type=\\"arrowRight\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><div data-euiicon-type=\\"gear\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></div></button></div></div></div></div></div></div></div></div></div></div>"
+</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"flex-shrink: 0;\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><span data-euiicon-type=\\"logoElastic\\"></span></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><span data-euiicon-type=\\"arrowLeft\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><span data-euiicon-type=\\"arrowRight\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight euiPopover--withTitle\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost\\" type=\\"button\\" aria-label=\\"Settings\\"><span data-euiicon-type=\\"gear\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div></div></div></div></div></div></div></div></div></div>"
 `;
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/footer/__stories__/__snapshots__/footer.stories.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/footer/__stories__/__snapshots__/footer.stories.storyshot
index 2d3a9c460272c..2fe222b4238a3 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/footer/__stories__/__snapshots__/footer.stories.storyshot
+++ b/x-pack/plugins/canvas/shareable_runtime/components/footer/__stories__/__snapshots__/footer.stories.storyshot
@@ -1277,7 +1277,7 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
                 rel=""
                 title="Powered by Elastic.co"
               >
-                <div
+                <span
                   data-euiicon-type="logoElastic"
                   size="l"
                 />
@@ -1333,7 +1333,7 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
                   onClick={[Function]}
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     className="euiButtonIcon__icon"
                     data-euiicon-type="arrowLeft"
@@ -1382,7 +1382,7 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
                   onClick={[Function]}
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     className="euiButtonIcon__icon"
                     data-euiicon-type="arrowRight"
@@ -1415,7 +1415,7 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
                       onClick={[Function]}
                       type="button"
                     >
-                      <div
+                      <span
                         aria-hidden="true"
                         className="euiButtonIcon__icon"
                         data-euiicon-type="gear"
@@ -1529,7 +1529,7 @@ exports[`Storyshots shareables/Footer contextual: hello 1`] = `
                 rel=""
                 title="Powered by Elastic.co"
               >
-                <div
+                <span
                   data-euiicon-type="logoElastic"
                   size="l"
                 />
@@ -1585,7 +1585,7 @@ exports[`Storyshots shareables/Footer contextual: hello 1`] = `
                   onClick={[Function]}
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     className="euiButtonIcon__icon"
                     data-euiicon-type="arrowLeft"
@@ -1633,7 +1633,7 @@ exports[`Storyshots shareables/Footer contextual: hello 1`] = `
                   onClick={[Function]}
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     className="euiButtonIcon__icon"
                     data-euiicon-type="arrowRight"
@@ -1666,7 +1666,7 @@ exports[`Storyshots shareables/Footer contextual: hello 1`] = `
                       onClick={[Function]}
                       type="button"
                     >
-                      <div
+                      <span
                         aria-hidden="true"
                         className="euiButtonIcon__icon"
                         data-euiicon-type="gear"
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/footer/__stories__/__snapshots__/page_controls.stories.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/footer/__stories__/__snapshots__/page_controls.stories.storyshot
index e58d4cccf3959..3e4981c228a36 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/footer/__stories__/__snapshots__/page_controls.stories.storyshot
+++ b/x-pack/plugins/canvas/shareable_runtime/components/footer/__stories__/__snapshots__/page_controls.stories.storyshot
@@ -28,7 +28,7 @@ exports[`Storyshots shareables/Footer/PageControls component 1`] = `
         onClick={[Function]}
         type="button"
       >
-        <div
+        <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
           data-euiicon-type="arrowLeft"
@@ -77,7 +77,7 @@ exports[`Storyshots shareables/Footer/PageControls component 1`] = `
         onClick={[Function]}
         type="button"
       >
-        <div
+        <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
           data-euiicon-type="arrowRight"
@@ -122,7 +122,7 @@ exports[`Storyshots shareables/Footer/PageControls contextual: austin 1`] = `
         onClick={[Function]}
         type="button"
       >
-        <div
+        <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
           data-euiicon-type="arrowLeft"
@@ -171,7 +171,7 @@ exports[`Storyshots shareables/Footer/PageControls contextual: austin 1`] = `
         onClick={[Function]}
         type="button"
       >
-        <div
+        <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
           data-euiicon-type="arrowRight"
@@ -216,7 +216,7 @@ exports[`Storyshots shareables/Footer/PageControls contextual: hello 1`] = `
         onClick={[Function]}
         type="button"
       >
-        <div
+        <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
           data-euiicon-type="arrowLeft"
@@ -265,7 +265,7 @@ exports[`Storyshots shareables/Footer/PageControls contextual: hello 1`] = `
         onClick={[Function]}
         type="button"
       >
-        <div
+        <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
           data-euiicon-type="arrowRight"
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/footer/__stories__/__snapshots__/title.stories.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/footer/__stories__/__snapshots__/title.stories.storyshot
index 8d43fbf83bcd0..7d27ac836e130 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/footer/__stories__/__snapshots__/title.stories.storyshot
+++ b/x-pack/plugins/canvas/shareable_runtime/components/footer/__stories__/__snapshots__/title.stories.storyshot
@@ -31,7 +31,7 @@ exports[`Storyshots shareables/Footer/Title component 1`] = `
         rel=""
         title="Powered by Elastic.co"
       >
-        <div
+        <span
           data-euiicon-type="logoElastic"
           size="l"
         />
@@ -95,7 +95,7 @@ exports[`Storyshots shareables/Footer/Title contextual: austin 1`] = `
         rel=""
         title="Powered by Elastic.co"
       >
-        <div
+        <span
           data-euiicon-type="logoElastic"
           size="l"
         />
@@ -159,7 +159,7 @@ exports[`Storyshots shareables/Footer/Title contextual: hello 1`] = `
         rel=""
         title="Powered by Elastic.co"
       >
-        <div
+        <span
           data-euiicon-type="logoElastic"
           size="l"
         />
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/autoplay_settings.stories.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/autoplay_settings.stories.storyshot
index 0940cd2d2693c..a231f5ebfdfc0 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/autoplay_settings.stories.storyshot
+++ b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/autoplay_settings.stories.storyshot
@@ -44,12 +44,12 @@ exports[`Storyshots shareables/Footer/Settings/AutoplaySettings component: off,
           <span
             className="euiSwitch__track"
           >
-            <div
+            <span
               className="euiSwitch__icon"
               data-euiicon-type="cross"
               size="m"
             />
-            <div
+            <span
               className="euiSwitch__icon euiSwitch__icon--checked"
               data-euiicon-type="check"
               size="m"
@@ -207,12 +207,12 @@ exports[`Storyshots shareables/Footer/Settings/AutoplaySettings component: on, 5
           <span
             className="euiSwitch__track"
           >
-            <div
+            <span
               className="euiSwitch__icon"
               data-euiicon-type="cross"
               size="m"
             />
-            <div
+            <span
               className="euiSwitch__icon euiSwitch__icon--checked"
               data-euiicon-type="check"
               size="m"
@@ -370,12 +370,12 @@ exports[`Storyshots shareables/Footer/Settings/AutoplaySettings contextual 1`] =
           <span
             className="euiSwitch__track"
           >
-            <div
+            <span
               className="euiSwitch__icon"
               data-euiicon-type="cross"
               size="m"
             />
-            <div
+            <span
               className="euiSwitch__icon euiSwitch__icon--checked"
               data-euiicon-type="check"
               size="m"
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/settings.stories.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/settings.stories.storyshot
index 75db465d3f91f..af0ddccf48e36 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/settings.stories.storyshot
+++ b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/settings.stories.storyshot
@@ -38,7 +38,7 @@ exports[`Storyshots shareables/Footer/Settings component 1`] = `
             onClick={[Function]}
             type="button"
           >
-            <div
+            <span
               aria-hidden="true"
               className="euiButtonIcon__icon"
               data-euiicon-type="gear"
@@ -90,7 +90,7 @@ exports[`Storyshots shareables/Footer/Settings contextual 1`] = `
             onClick={[Function]}
             type="button"
           >
-            <div
+            <span
               aria-hidden="true"
               className="euiButtonIcon__icon"
               data-euiicon-type="gear"
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/toolbar_settings.stories.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/toolbar_settings.stories.storyshot
index 82e7685caaab3..a8a3f584bbf51 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/toolbar_settings.stories.storyshot
+++ b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/toolbar_settings.stories.storyshot
@@ -55,12 +55,12 @@ exports[`Storyshots shareables/Footer/Settings/ToolbarSettings component: off 1`
               <span
                 className="euiSwitch__track"
               >
-                <div
+                <span
                   className="euiSwitch__icon"
                   data-euiicon-type="cross"
                   size="m"
                 />
-                <div
+                <span
                   className="euiSwitch__icon euiSwitch__icon--checked"
                   data-euiicon-type="check"
                   size="m"
@@ -143,12 +143,12 @@ exports[`Storyshots shareables/Footer/Settings/ToolbarSettings component: on 1`]
               <span
                 className="euiSwitch__track"
               >
-                <div
+                <span
                   className="euiSwitch__icon"
                   data-euiicon-type="cross"
                   size="m"
                 />
-                <div
+                <span
                   className="euiSwitch__icon euiSwitch__icon--checked"
                   data-euiicon-type="check"
                   size="m"
@@ -231,12 +231,12 @@ exports[`Storyshots shareables/Footer/Settings/ToolbarSettings contextual 1`] =
               <span
                 className="euiSwitch__track"
               >
-                <div
+                <span
                   className="euiSwitch__icon"
                   data-euiicon-type="cross"
                   size="m"
                 />
-                <div
+                <span
                   className="euiSwitch__icon euiSwitch__icon--checked"
                   data-euiicon-type="check"
                   size="m"
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap
index c4917539cbeda..24481aaff641e 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap
+++ b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__tests__/__snapshots__/settings.test.tsx.snap
@@ -43,7 +43,7 @@ exports[`<Settings /> can navigate Autoplay Settings 1`] = `
                   <span
                     class="euiContextMenu__itemLayout"
                   >
-                    <div
+                    <span
                       class="euiContextMenu__icon"
                       data-euiicon-type="play"
                     />
@@ -52,7 +52,7 @@ exports[`<Settings /> can navigate Autoplay Settings 1`] = `
                     >
                       Auto Play
                     </span>
-                    <div
+                    <span
                       class="euiContextMenu__arrow"
                       data-euiicon-type="arrowRight"
                     />
@@ -65,7 +65,7 @@ exports[`<Settings /> can navigate Autoplay Settings 1`] = `
                   <span
                     class="euiContextMenu__itemLayout"
                   >
-                    <div
+                    <span
                       class="euiContextMenu__icon"
                       data-euiicon-type="boxesHorizontal"
                     />
@@ -74,7 +74,7 @@ exports[`<Settings /> can navigate Autoplay Settings 1`] = `
                     >
                       Toolbar
                     </span>
-                    <div
+                    <span
                       class="euiContextMenu__arrow"
                       data-euiicon-type="arrowRight"
                     />
@@ -133,7 +133,7 @@ exports[`<Settings /> can navigate Autoplay Settings 2`] = `
                   <span
                     class="euiContextMenu__itemLayout"
                   >
-                    <div
+                    <span
                       class="euiContextMenu__icon"
                       data-euiicon-type="play"
                     />
@@ -142,7 +142,7 @@ exports[`<Settings /> can navigate Autoplay Settings 2`] = `
                     >
                       Auto Play
                     </span>
-                    <div
+                    <span
                       class="euiContextMenu__arrow"
                       data-euiicon-type="arrowRight"
                     />
@@ -155,7 +155,7 @@ exports[`<Settings /> can navigate Autoplay Settings 2`] = `
                   <span
                     class="euiContextMenu__itemLayout"
                   >
-                    <div
+                    <span
                       class="euiContextMenu__icon"
                       data-euiicon-type="boxesHorizontal"
                     />
@@ -164,7 +164,7 @@ exports[`<Settings /> can navigate Autoplay Settings 2`] = `
                     >
                       Toolbar
                     </span>
-                    <div
+                    <span
                       class="euiContextMenu__arrow"
                       data-euiicon-type="arrowRight"
                     />
@@ -185,7 +185,7 @@ exports[`<Settings /> can navigate Autoplay Settings 2`] = `
               <span
                 class="euiContextMenu__itemLayout"
               >
-                <div
+                <span
                   class="euiContextMenu__icon"
                   data-euiicon-type="arrowLeft"
                 />
@@ -222,11 +222,11 @@ exports[`<Settings /> can navigate Autoplay Settings 2`] = `
                         <span
                           class="euiSwitch__track"
                         >
-                          <div
+                          <span
                             class="euiSwitch__icon"
                             data-euiicon-type="cross"
                           />
-                          <div
+                          <span
                             class="euiSwitch__icon euiSwitch__icon--checked"
                             data-euiicon-type="check"
                           />
@@ -376,7 +376,7 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 1`] =
                   <span
                     class="euiContextMenu__itemLayout"
                   >
-                    <div
+                    <span
                       class="euiContextMenu__icon"
                       data-euiicon-type="play"
                     />
@@ -385,7 +385,7 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 1`] =
                     >
                       Auto Play
                     </span>
-                    <div
+                    <span
                       class="euiContextMenu__arrow"
                       data-euiicon-type="arrowRight"
                     />
@@ -398,7 +398,7 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 1`] =
                   <span
                     class="euiContextMenu__itemLayout"
                   >
-                    <div
+                    <span
                       class="euiContextMenu__icon"
                       data-euiicon-type="boxesHorizontal"
                     />
@@ -407,7 +407,7 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 1`] =
                     >
                       Toolbar
                     </span>
-                    <div
+                    <span
                       class="euiContextMenu__arrow"
                       data-euiicon-type="arrowRight"
                     />
@@ -466,7 +466,7 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] =
                   <span
                     class="euiContextMenu__itemLayout"
                   >
-                    <div
+                    <span
                       class="euiContextMenu__icon"
                       data-euiicon-type="play"
                     />
@@ -475,7 +475,7 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] =
                     >
                       Auto Play
                     </span>
-                    <div
+                    <span
                       class="euiContextMenu__arrow"
                       data-euiicon-type="arrowRight"
                     />
@@ -488,7 +488,7 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] =
                   <span
                     class="euiContextMenu__itemLayout"
                   >
-                    <div
+                    <span
                       class="euiContextMenu__icon"
                       data-euiicon-type="boxesHorizontal"
                     />
@@ -497,7 +497,7 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] =
                     >
                       Toolbar
                     </span>
-                    <div
+                    <span
                       class="euiContextMenu__arrow"
                       data-euiicon-type="arrowRight"
                     />
@@ -518,7 +518,7 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] =
               <span
                 class="euiContextMenu__itemLayout"
               >
-                <div
+                <span
                   class="euiContextMenu__icon"
                   data-euiicon-type="arrowLeft"
                 />
@@ -564,11 +564,11 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] =
                             <span
                               class="euiSwitch__track"
                             >
-                              <div
+                              <span
                                 class="euiSwitch__icon"
                                 data-euiicon-type="cross"
                               />
-                              <div
+                              <span
                                 class="euiSwitch__icon euiSwitch__icon--checked"
                                 data-euiicon-type="check"
                               />
@@ -601,4 +601,4 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] =
 </div>
 `;
 
-exports[`<Settings /> can navigate Toolbar Settings, closes when activated 3`] = `"<div><div data-eui=\\"EuiFocusTrap\\"><div class=\\"euiPanel euiPopover__panel euiPopover__panel--top euiPopover__panel-withTitle\\" aria-live=\\"assertive\\" role=\\"dialog\\" aria-modal=\\"true\\" style=\\"top: -16px; left: -22px; z-index: 2000;\\"><div class=\\"euiPopover__panelArrow euiPopover__panelArrow--top\\" style=\\"left: 10px; top: 0px;\\"></div><div><div class=\\"euiContextMenu\\" style=\\"height: 0px;\\"><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txOutLeft\\" tabindex=\\"0\\"><div class=\\"euiPopoverTitle\\"><span class=\\"euiContextMenu__itemLayout\\">Settings</span></div><div><div><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><div data-euiicon-type=\\"play\\" class=\\"euiContextMenu__icon\\"></div><span class=\\"euiContextMenuItem__text\\">Auto Play</span><div data-euiicon-type=\\"arrowRight\\" class=\\"euiContextMenu__arrow\\"></div></span></button><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><div data-euiicon-type=\\"boxesHorizontal\\" class=\\"euiContextMenu__icon\\"></div><span class=\\"euiContextMenuItem__text\\">Toolbar</span><div data-euiicon-type=\\"arrowRight\\" class=\\"euiContextMenu__arrow\\"></div></span></button></div></div></div><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txInLeft\\" tabindex=\\"0\\"><button class=\\"euiContextMenuPanelTitle\\" type=\\"button\\" data-test-subj=\\"contextMenuPanelTitleButton\\"><span class=\\"euiContextMenu__itemLayout\\"><div data-euiicon-type=\\"arrowLeft\\" class=\\"euiContextMenu__icon\\"></div><span class=\\"euiContextMenu__text\\">Toolbar</span></span></button><div><div><div style=\\"padding: 16px;\\"><div class=\\"euiFormRow\\" id=\\"generated-id-row\\"><div class=\\"euiFormRow__fieldWrapper\\"><div class=\\"euiSwitch\\"><button id=\\"generated-id\\" aria-checked=\\"true\\" class=\\"euiSwitch__button\\" role=\\"switch\\" type=\\"button\\" aria-labelledby=\\"generated-id\\" data-test-subj=\\"hideToolbarSwitch\\" name=\\"toolbarHide\\" aria-describedby=\\"generated-id-help\\"><span class=\\"euiSwitch__body\\"><span class=\\"euiSwitch__thumb\\"></span><span class=\\"euiSwitch__track\\"><div data-euiicon-type=\\"cross\\" class=\\"euiSwitch__icon\\"></div><div data-euiicon-type=\\"check\\" class=\\"euiSwitch__icon euiSwitch__icon--checked\\"></div></span></span></button><span class=\\"euiSwitch__label\\" id=\\"generated-id\\">Hide Toolbar</span></div><div class=\\"euiFormHelpText euiFormRow__text\\" id=\\"generated-id-help\\">Hide the toolbar when the mouse is not within the Canvas?</div></div></div></div></div></div></div></div></div></div></div></div>"`;
+exports[`<Settings /> can navigate Toolbar Settings, closes when activated 3`] = `"<div><div data-eui=\\"EuiFocusTrap\\"><div class=\\"euiPanel euiPopover__panel euiPopover__panel--top euiPopover__panel-withTitle\\" aria-live=\\"assertive\\" role=\\"dialog\\" aria-modal=\\"true\\" style=\\"top: -16px; left: -22px; z-index: 2000;\\"><div class=\\"euiPopover__panelArrow euiPopover__panelArrow--top\\" style=\\"left: 10px; top: 0px;\\"></div><div><div class=\\"euiContextMenu\\" style=\\"height: 0px;\\"><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txOutLeft\\" tabindex=\\"0\\"><div class=\\"euiPopoverTitle\\"><span class=\\"euiContextMenu__itemLayout\\">Settings</span></div><div><div><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><span data-euiicon-type=\\"play\\" class=\\"euiContextMenu__icon\\"></span><span class=\\"euiContextMenuItem__text\\">Auto Play</span><span data-euiicon-type=\\"arrowRight\\" class=\\"euiContextMenu__arrow\\"></span></span></button><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><span data-euiicon-type=\\"boxesHorizontal\\" class=\\"euiContextMenu__icon\\"></span><span class=\\"euiContextMenuItem__text\\">Toolbar</span><span data-euiicon-type=\\"arrowRight\\" class=\\"euiContextMenu__arrow\\"></span></span></button></div></div></div><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txInLeft\\" tabindex=\\"0\\"><button class=\\"euiContextMenuPanelTitle\\" type=\\"button\\" data-test-subj=\\"contextMenuPanelTitleButton\\"><span class=\\"euiContextMenu__itemLayout\\"><span data-euiicon-type=\\"arrowLeft\\" class=\\"euiContextMenu__icon\\"></span><span class=\\"euiContextMenu__text\\">Toolbar</span></span></button><div><div><div style=\\"padding: 16px;\\"><div class=\\"euiFormRow\\" id=\\"generated-id-row\\"><div class=\\"euiFormRow__fieldWrapper\\"><div class=\\"euiSwitch\\"><button id=\\"generated-id\\" aria-checked=\\"true\\" class=\\"euiSwitch__button\\" role=\\"switch\\" type=\\"button\\" aria-labelledby=\\"generated-id\\" data-test-subj=\\"hideToolbarSwitch\\" name=\\"toolbarHide\\" aria-describedby=\\"generated-id-help\\"><span class=\\"euiSwitch__body\\"><span class=\\"euiSwitch__thumb\\"></span><span class=\\"euiSwitch__track\\"><span data-euiicon-type=\\"cross\\" class=\\"euiSwitch__icon\\"></span><span data-euiicon-type=\\"check\\" class=\\"euiSwitch__icon euiSwitch__icon--checked\\"></span></span></span></button><span class=\\"euiSwitch__label\\" id=\\"generated-id\\">Hide Toolbar</span></div><div class=\\"euiFormHelpText euiFormRow__text\\" id=\\"generated-id-help\\">Hide the toolbar when the mouse is not within the Canvas?</div></div></div></div></div></div></div></div></div></div></div></div>"`;
diff --git a/x-pack/plugins/global_search_bar/public/components/__snapshots__/search_bar.test.tsx.snap b/x-pack/plugins/global_search_bar/public/components/__snapshots__/search_bar.test.tsx.snap
index ff9d603bc6375..bf7eacd2b52a1 100644
--- a/x-pack/plugins/global_search_bar/public/components/__snapshots__/search_bar.test.tsx.snap
+++ b/x-pack/plugins/global_search_bar/public/components/__snapshots__/search_bar.test.tsx.snap
@@ -35,7 +35,7 @@ exports[`SearchBar supports keyboard shortcuts 1`] = `
   aria-haspopup="listbox"
   aria-label="Filter options"
   autocomplete="off"
-  class="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch--compressed euiFieldSearch-isClearable euiSelectableSearch euiSelectableTemplateSitewide__search"
+  class="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch--compressed euiSelectableSearch euiSelectableTemplateSitewide__search"
   data-test-subj="header-search"
   placeholder="Search Elastic"
   type="search"
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.tsx.snap b/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.tsx.snap
index a25af12ff7f53..1c4627794c45b 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.tsx.snap
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.tsx.snap
@@ -292,7 +292,7 @@ exports[`extend index management ilm summary extension should return extension w
           size="m"
           type="cross"
         >
-          <div
+          <span
             aria-hidden="true"
             className="euiCallOutHeader__icon"
             data-euiicon-type="cross"
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/components/__snapshots__/policy_table.test.tsx.snap b/x-pack/plugins/index_lifecycle_management/__jest__/components/__snapshots__/policy_table.test.tsx.snap
index cbb9f82888701..06cd77558b443 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/components/__snapshots__/policy_table.test.tsx.snap
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/components/__snapshots__/policy_table.test.tsx.snap
@@ -55,7 +55,7 @@ exports[`policy table should show empty state when there are not any policies 1`
     <div
       class="euiEmptyPrompt"
     >
-      <div
+      <span
         color="subdued"
         data-euiicon-type="managementApp"
       />
@@ -95,7 +95,7 @@ exports[`policy table should show empty state when there are not any policies 1`
         <span
           class="euiButtonContent euiButton__content"
         >
-          <div
+          <span
             class="euiButtonContent__icon"
             data-euiicon-type="plusInCircle"
           />
diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/license_status.test.js.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/license_status.test.js.snap
index 1eae41b5fc38c..9bd1c878f8679 100644
--- a/x-pack/plugins/license_management/__jest__/__snapshots__/license_status.test.js.snap
+++ b/x-pack/plugins/license_management/__jest__/__snapshots__/license_status.test.js.snap
@@ -1,5 +1,5 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`LicenseStatus component should display display warning is expired 1`] = `"<div class=\\"euiTextAlign euiTextAlign--center\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div data-euiicon-type=\\"alert\\" color=\\"danger\\"></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><h1 data-test-subj=\\"licenseText\\" class=\\"euiTitle euiTitle--medium\\">Your Platinum license has expired</h1></div></div><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiText euiText--medium\\" data-test-subj=\\"licenseSubText\\">Your license expired on <strong></strong></div></div>"`;
+exports[`LicenseStatus component should display display warning is expired 1`] = `"<div class=\\"euiTextAlign euiTextAlign--center\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><h1 data-test-subj=\\"licenseText\\" class=\\"euiTitle euiTitle--medium\\">Your Platinum license has expired</h1></div></div><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiText euiText--medium\\" data-test-subj=\\"licenseSubText\\">Your license expired on <strong></strong></div></div>"`;
 
-exports[`LicenseStatus component should display normally when license is active 1`] = `"<div class=\\"euiTextAlign euiTextAlign--center\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div data-euiicon-type=\\"checkInCircleFilled\\" color=\\"success\\"></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><h1 data-test-subj=\\"licenseText\\" class=\\"euiTitle euiTitle--medium\\">Your Gold license is active</h1></div></div><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiText euiText--medium\\" data-test-subj=\\"licenseSubText\\">Your license will expire on <strong>October 12, 2099 7:00 PM EST</strong></div></div>"`;
+exports[`LicenseStatus component should display normally when license is active 1`] = `"<div class=\\"euiTextAlign euiTextAlign--center\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><span data-euiicon-type=\\"checkInCircleFilled\\" color=\\"success\\"></span></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><h1 data-test-subj=\\"licenseText\\" class=\\"euiTitle euiTitle--medium\\">Your Gold license is active</h1></div></div><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiText euiText--medium\\" data-test-subj=\\"licenseSubText\\">Your license will expire on <strong>October 12, 2099 7:00 PM EST</strong></div></div>"`;
diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
index b3e2c055c6738..429f6c7af6e27 100644
--- a/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
+++ b/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
@@ -308,7 +308,7 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                                 class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
                                 type="button"
                               >
-                                <div
+                                <span
                                   aria-hidden="true"
                                   class="euiButtonIcon__icon"
                                   data-euiicon-type="cross"
@@ -457,7 +457,7 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                                         size="m"
                                         type="cross"
                                       >
-                                        <div
+                                        <span
                                           aria-hidden="true"
                                           className="euiButtonIcon__icon"
                                           data-euiicon-type="cross"
@@ -749,7 +749,7 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                                               size="l"
                                               type="importAction"
                                             >
-                                              <div
+                                              <span
                                                 aria-hidden="true"
                                                 className="euiFilePicker__icon"
                                                 data-euiicon-type="importAction"
@@ -1437,7 +1437,7 @@ exports[`UploadLicense should display an error when ES says license is expired 1
                                               size="l"
                                               type="importAction"
                                             >
-                                              <div
+                                              <span
                                                 aria-hidden="true"
                                                 className="euiFilePicker__icon"
                                                 data-euiicon-type="importAction"
@@ -2125,7 +2125,7 @@ exports[`UploadLicense should display an error when ES says license is invalid 1
                                               size="l"
                                               type="importAction"
                                             >
-                                              <div
+                                              <span
                                                 aria-hidden="true"
                                                 className="euiFilePicker__icon"
                                                 data-euiicon-type="importAction"
@@ -2813,7 +2813,7 @@ exports[`UploadLicense should display an error when submitting invalid JSON 1`]
                                               size="l"
                                               type="importAction"
                                             >
-                                              <div
+                                              <span
                                                 aria-hidden="true"
                                                 className="euiFilePicker__icon"
                                                 data-euiicon-type="importAction"
@@ -3501,7 +3501,7 @@ exports[`UploadLicense should display error when ES returns error 1`] = `
                                               size="l"
                                               type="importAction"
                                             >
-                                              <div
+                                              <span
                                                 aria-hidden="true"
                                                 className="euiFilePicker__icon"
                                                 data-euiicon-type="importAction"
diff --git a/x-pack/plugins/logstash/public/application/components/upgrade_failure/__snapshots__/upgrade_failure.test.js.snap b/x-pack/plugins/logstash/public/application/components/upgrade_failure/__snapshots__/upgrade_failure.test.js.snap
index d0f1bed8e8e9e..c4d9168170a93 100644
--- a/x-pack/plugins/logstash/public/application/components/upgrade_failure/__snapshots__/upgrade_failure.test.js.snap
+++ b/x-pack/plugins/logstash/public/application/components/upgrade_failure/__snapshots__/upgrade_failure.test.js.snap
@@ -180,7 +180,7 @@ exports[`UpgradeFailure component passes expected text for new pipeline 1`] = `
                                 size="xl"
                                 type="alert"
                               >
-                                <div
+                                <span
                                   data-euiicon-type="alert"
                                   size="xl"
                                 />
@@ -536,7 +536,7 @@ exports[`UpgradeFailure component passes expected text for not manual upgrade 1`
                                 size="xl"
                                 type="alert"
                               >
-                                <div
+                                <span
                                   data-euiicon-type="alert"
                                   size="xl"
                                 />
@@ -892,7 +892,7 @@ exports[`UpgradeFailure component passes expected text for not new pipeline 1`]
                                 size="xl"
                                 type="alert"
                               >
-                                <div
+                                <span
                                   data-euiicon-type="alert"
                                   size="xl"
                                 />
diff --git a/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/__snapshots__/tiled_vector_layer.test.tsx.snap b/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/__snapshots__/tiled_vector_layer.test.tsx.snap
index f0ae93601ce8a..3a542ce9bca1e 100644
--- a/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/__snapshots__/tiled_vector_layer.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/layers/tiled_vector_layer/__snapshots__/tiled_vector_layer.test.tsx.snap
@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`icon should use vector icon 1`] = `
-<div
+<span
   data-euiicon-type="vector"
   size="m"
 />
diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/nodes/__tests__/__snapshots__/cells.test.js.snap b/x-pack/plugins/monitoring/public/components/elasticsearch/nodes/__tests__/__snapshots__/cells.test.js.snap
index b0b5ceb46d16c..89b32d37a7445 100644
--- a/x-pack/plugins/monitoring/public/components/elasticsearch/nodes/__tests__/__snapshots__/cells.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/elasticsearch/nodes/__tests__/__snapshots__/cells.test.js.snap
@@ -31,7 +31,7 @@ exports[`Node Listing Metric Cell should format a non-percentage metric 1`] = `
           <div
             class="euiPopover__anchor"
           >
-            <div
+            <span
               data-euiicon-type="arrowDown"
               data-test-subj="monitoringCellIcon-testCell2"
               role="button"
@@ -78,7 +78,7 @@ exports[`Node Listing Metric Cell should format a percentage metric 1`] = `
           <div
             class="euiPopover__anchor"
           >
-            <div
+            <span
               data-euiicon-type="arrowDown"
               data-test-subj="monitoringCellIcon-testCell"
               role="button"
diff --git a/x-pack/plugins/monitoring/public/components/no_data/__tests__/__snapshots__/no_data.test.js.snap b/x-pack/plugins/monitoring/public/components/no_data/__tests__/__snapshots__/no_data.test.js.snap
index c06f71e79e766..08a8cc57618a5 100644
--- a/x-pack/plugins/monitoring/public/components/no_data/__tests__/__snapshots__/no_data.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/no_data/__tests__/__snapshots__/no_data.test.js.snap
@@ -16,7 +16,7 @@ exports[`NoData should show a default message if reason is unknown 1`] = `
     <div
       class="euiPanel euiPanel--paddingLarge euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter eui-textCenter"
     >
-      <div
+      <span
         data-euiicon-type="monitoringApp"
       />
       <div
@@ -106,7 +106,7 @@ exports[`NoData should show text next to the spinner while checking a setting 1`
     <div
       class="euiPanel euiPanel--paddingLarge euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter eui-textCenter"
     >
-      <div
+      <span
         data-euiicon-type="monitoringApp"
       />
       <div
diff --git a/x-pack/plugins/monitoring/public/components/summary_status/__snapshots__/summary_status.test.js.snap b/x-pack/plugins/monitoring/public/components/summary_status/__snapshots__/summary_status.test.js.snap
index 63ff157eb0d6d..7b00b4f0dcee4 100644
--- a/x-pack/plugins/monitoring/public/components/summary_status/__snapshots__/summary_status.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/summary_status/__snapshots__/summary_status.test.js.snap
@@ -29,15 +29,14 @@ exports[`Summary Status Component should allow label to be optional 1`] = `
           class="euiTitle euiTitle--xxxsmall euiStat__title"
         >
           Status: 
+          <span
+            alt="Status: yellow"
+            color="warning"
+            data-euiicon-type="dot"
+            data-test-subj="statusIcon"
+          />
+           Yellow
         </p>
-        <div
-          alt="Status: yellow"
-          color="warning"
-          data-euiicon-type="dot"
-          data-test-subj="statusIcon"
-        />
-         Yellow
-        <p />
       </div>
     </div>
     <div
@@ -203,15 +202,14 @@ exports[`Summary Status Component should render metrics in a summary bar 1`] = `
           class="euiTitle euiTitle--xxxsmall euiStat__title"
         >
           Status: 
+          <span
+            alt="Status: green"
+            color="success"
+            data-euiicon-type="dot"
+            data-test-subj="statusIcon"
+          />
+           Green
         </p>
-        <div
-          alt="Status: green"
-          color="success"
-          data-euiicon-type="dot"
-          data-test-subj="statusIcon"
-        />
-         Green
-        <p />
       </div>
     </div>
     <div
diff --git a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap
index a05da1a65d4c8..4f54c2f9a1675 100644
--- a/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap
+++ b/x-pack/plugins/remote_clusters/public/application/sections/components/remote_cluster_form/__snapshots__/remote_cluster_form.test.js.snap
@@ -511,7 +511,7 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
                                             size="m"
                                             type="cross"
                                           >
-                                            <div
+                                            <span
                                               className="euiSwitch__icon"
                                               data-euiicon-type="cross"
                                               size="m"
@@ -522,7 +522,7 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
                                             size="m"
                                             type="check"
                                           >
-                                            <div
+                                            <span
                                               className="euiSwitch__icon euiSwitch__icon--checked"
                                               data-euiicon-type="check"
                                               size="m"
@@ -1186,7 +1186,7 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
                                     size="m"
                                     type="cross"
                                   >
-                                    <div
+                                    <span
                                       className="euiSwitch__icon"
                                       data-euiicon-type="cross"
                                       size="m"
@@ -1197,7 +1197,7 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
                                     size="m"
                                     type="check"
                                   >
-                                    <div
+                                    <span
                                       className="euiSwitch__icon euiSwitch__icon--checked"
                                       data-euiicon-type="check"
                                       size="m"
@@ -1306,7 +1306,7 @@ exports[`RemoteClusterForm proxy mode renders correct connection settings when u
                               size="m"
                               type="check"
                             >
-                              <div
+                              <span
                                 className="euiButtonContent__icon"
                                 data-euiicon-type="check"
                                 size="m"
@@ -1512,11 +1512,11 @@ Array [
                         <span
                           class="euiSwitch__track"
                         >
-                          <div
+                          <span
                             class="euiSwitch__icon"
                             data-euiicon-type="cross"
                           />
-                          <div
+                          <span
                             class="euiSwitch__icon euiSwitch__icon--checked"
                             data-euiicon-type="check"
                           />
@@ -1729,11 +1729,11 @@ Array [
                     <span
                       class="euiSwitch__track"
                     >
-                      <div
+                      <span
                         class="euiSwitch__icon"
                         data-euiicon-type="cross"
                       />
-                      <div
+                      <span
                         class="euiSwitch__icon euiSwitch__icon--checked"
                         data-euiicon-type="check"
                       />
@@ -1777,7 +1777,7 @@ Array [
             <span
               class="euiButtonContent euiButton__content"
             >
-              <div
+              <span
                 class="euiButtonContent__icon"
                 data-euiicon-type="check"
               />
@@ -1979,11 +1979,11 @@ Array [
             <span
               class="euiSwitch__track"
             >
-              <div
+              <span
                 class="euiSwitch__icon"
                 data-euiicon-type="cross"
               />
-              <div
+              <span
                 class="euiSwitch__icon euiSwitch__icon--checked"
                 data-euiicon-type="check"
               />
diff --git a/x-pack/plugins/reporting/public/components/buttons/__snapshots__/report_info_button.test.tsx.snap b/x-pack/plugins/reporting/public/components/buttons/__snapshots__/report_info_button.test.tsx.snap
index 49d4cd4968d5e..ab554e05ace2d 100644
--- a/x-pack/plugins/reporting/public/components/buttons/__snapshots__/report_info_button.test.tsx.snap
+++ b/x-pack/plugins/reporting/public/components/buttons/__snapshots__/report_info_button.test.tsx.snap
@@ -14,7 +14,7 @@ exports[`ReportInfoButton handles button click flyout on click 1`] = `
     size="m"
     type="iInCircle"
   >
-    <div
+    <span
       aria-hidden="true"
       className="euiButtonIcon__icon"
       data-euiicon-type="iInCircle"
@@ -87,7 +87,7 @@ Array [
                   size="m"
                   type="cross"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     className="euiButtonIcon__icon"
                     data-euiicon-type="cross"
@@ -172,7 +172,7 @@ Array [
             size="m"
             type="cross"
           >
-            <div
+            <span
               aria-hidden="true"
               className="euiButtonIcon__icon"
               data-euiicon-type="cross"
@@ -288,7 +288,7 @@ Array [
                   size="m"
                   type="cross"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     className="euiButtonIcon__icon"
                     data-euiicon-type="cross"
@@ -371,7 +371,7 @@ Array [
             size="m"
             type="cross"
           >
-            <div
+            <span
               aria-hidden="true"
               className="euiButtonIcon__icon"
               data-euiicon-type="cross"
diff --git a/x-pack/plugins/security/public/authentication/overwritten_session/__snapshots__/overwritten_session_page.test.tsx.snap b/x-pack/plugins/security/public/authentication/overwritten_session/__snapshots__/overwritten_session_page.test.tsx.snap
index 065afa0b3ffb9..1124924fcdda2 100644
--- a/x-pack/plugins/security/public/authentication/overwritten_session/__snapshots__/overwritten_session_page.test.tsx.snap
+++ b/x-pack/plugins/security/public/authentication/overwritten_session/__snapshots__/overwritten_session_page.test.tsx.snap
@@ -33,7 +33,7 @@ exports[`OverwrittenSessionPage renders as expected 1`] = `
             size="xxl"
             type="logoElastic"
           >
-            <div
+            <span
               data-euiicon-type="logoElastic"
               size="xxl"
             />
diff --git a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/__snapshots__/api_keys_grid_page.test.tsx.snap b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/__snapshots__/api_keys_grid_page.test.tsx.snap
index 48c5680bac4e4..b316182f3b80d 100644
--- a/x-pack/plugins/security/public/management/api_keys/api_keys_grid/__snapshots__/api_keys_grid_page.test.tsx.snap
+++ b/x-pack/plugins/security/public/management/api_keys/api_keys_grid/__snapshots__/api_keys_grid_page.test.tsx.snap
@@ -31,7 +31,7 @@ exports[`APIKeysGridPage renders a callout when API keys are not enabled 1`] = `
           size="m"
           type="alert"
         >
-          <div
+          <span
             aria-hidden="true"
             className="euiCallOutHeader__icon"
             data-euiicon-type="alert"
@@ -154,7 +154,7 @@ exports[`APIKeysGridPage renders permission denied if user does not have require
                   size="xxl"
                   type="securityApp"
                 >
-                  <div
+                  <span
                     color="subdued"
                     data-euiicon-type="securityApp"
                     size="xxl"
diff --git a/x-pack/plugins/security/public/management/roles/roles_grid/__snapshots__/roles_grid_page.test.tsx.snap b/x-pack/plugins/security/public/management/roles/roles_grid/__snapshots__/roles_grid_page.test.tsx.snap
index 16b9de4bae083..ef1e9bac38270 100644
--- a/x-pack/plugins/security/public/management/roles/roles_grid/__snapshots__/roles_grid_page.test.tsx.snap
+++ b/x-pack/plugins/security/public/management/roles/roles_grid/__snapshots__/roles_grid_page.test.tsx.snap
@@ -49,7 +49,7 @@ exports[`<RolesGridPage /> renders permission denied if required 1`] = `
                   size="xxl"
                   type="securityApp"
                 >
-                  <div
+                  <span
                     color="subdued"
                     data-euiicon-type="securityApp"
                     size="xxl"
diff --git a/x-pack/plugins/security/server/authorization/__snapshots__/reset_session_page.test.tsx.snap b/x-pack/plugins/security/server/authorization/__snapshots__/reset_session_page.test.tsx.snap
index 7ff1dbfcb1a4e..7e03450ffd1c7 100644
--- a/x-pack/plugins/security/server/authorization/__snapshots__/reset_session_page.test.tsx.snap
+++ b/x-pack/plugins/security/server/authorization/__snapshots__/reset_session_page.test.tsx.snap
@@ -1,3 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ResetSessionPage renders as expected 1`] = `"<html lang=\\"en\\"><head><link href=\\"/some-css-file.css\\" rel=\\"stylesheet\\"/><link href=\\"/some-other-css-file.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"apple-touch-icon\\" sizes=\\"180x180\\" href=\\"/path/to/base/ui/favicons/apple-touch-icon.png\\"/><link rel=\\"icon\\" type=\\"image/png\\" sizes=\\"32x32\\" href=\\"/path/to/base/ui/favicons/favicon-32x32.png\\"/><link rel=\\"icon\\" type=\\"image/png\\" sizes=\\"16x16\\" href=\\"/path/to/base/ui/favicons/favicon-16x16.png\\"/><link rel=\\"manifest\\" href=\\"/path/to/base/ui/favicons/manifest.json\\"/><link rel=\\"mask-icon\\" color=\\"#e8488b\\" href=\\"/path/to/base/ui/favicons/safari-pinned-tab.svg\\"/><link rel=\\"shortcut icon\\" href=\\"/path/to/base/ui/favicons/favicon.ico\\"/><script src=\\"/path/to/base/internal/security/reset_session_page.js\\"></script><meta name=\\"msapplication-config\\" content=\\"/path/to/base/ui/favicons/browserconfig.xml\\"/><meta name=\\"theme-color\\" content=\\"#ffffff\\"/></head><body><div class=\\"euiPage\\" style=\\"min-height:100vh\\"><main class=\\"euiPageBody\\"><div class=\\"euiPanel euiPanel--paddingLarge euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter\\"><div class=\\"euiEmptyPrompt\\"><div data-euiicon-type=\\"alert\\" color=\\"danger\\"></div><div class=\\"euiSpacer euiSpacer--s\\"></div><span class=\\"euiTextColor euiTextColor--subdued\\"><h2 class=\\"euiTitle euiTitle--medium\\">You do not have permission to access the requested page</h2><div class=\\"euiSpacer euiSpacer--m\\"></div><div class=\\"euiText euiText--medium\\"><p>Either go back to the previous page or log in as a different user.</p></div></span><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiSpacer euiSpacer--s\\"></div><div class=\\"euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiButton euiButton--primary euiButton--fill\\" href=\\"/path/to/logout\\" rel=\\"noreferrer\\" data-test-subj=\\"ResetSessionButton\\"><span class=\\"euiButtonContent euiButton__content\\"><span class=\\"euiButton__text\\">Log in as different user</span></span></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--primary\\" type=\\"button\\" id=\\"goBackButton\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\">Go back</span></span></button></div></div></div></div></main></div></body></html>"`;
+exports[`ResetSessionPage renders as expected 1`] = `"<html lang=\\"en\\"><head><link href=\\"/some-css-file.css\\" rel=\\"stylesheet\\"/><link href=\\"/some-other-css-file.css\\" rel=\\"stylesheet\\"/>MockedFonts<link rel=\\"apple-touch-icon\\" sizes=\\"180x180\\" href=\\"/path/to/base/ui/favicons/apple-touch-icon.png\\"/><link rel=\\"icon\\" type=\\"image/png\\" sizes=\\"32x32\\" href=\\"/path/to/base/ui/favicons/favicon-32x32.png\\"/><link rel=\\"icon\\" type=\\"image/png\\" sizes=\\"16x16\\" href=\\"/path/to/base/ui/favicons/favicon-16x16.png\\"/><link rel=\\"manifest\\" href=\\"/path/to/base/ui/favicons/manifest.json\\"/><link rel=\\"mask-icon\\" color=\\"#e8488b\\" href=\\"/path/to/base/ui/favicons/safari-pinned-tab.svg\\"/><link rel=\\"shortcut icon\\" href=\\"/path/to/base/ui/favicons/favicon.ico\\"/><script src=\\"/path/to/base/internal/security/reset_session_page.js\\"></script><meta name=\\"msapplication-config\\" content=\\"/path/to/base/ui/favicons/browserconfig.xml\\"/><meta name=\\"theme-color\\" content=\\"#ffffff\\"/></head><body><div class=\\"euiPage\\" style=\\"min-height:100vh\\"><main class=\\"euiPageBody\\"><div class=\\"euiPanel euiPanel--paddingLarge euiPageContent euiPageContent--verticalCenter euiPageContent--horizontalCenter\\"><div class=\\"euiEmptyPrompt\\"><span data-euiicon-type=\\"alert\\" color=\\"danger\\"></span><div class=\\"euiSpacer euiSpacer--s\\"></div><span class=\\"euiTextColor euiTextColor--subdued\\"><h2 class=\\"euiTitle euiTitle--medium\\">You do not have permission to access the requested page</h2><div class=\\"euiSpacer euiSpacer--m\\"></div><div class=\\"euiText euiText--medium\\"><p>Either go back to the previous page or log in as a different user.</p></div></span><div class=\\"euiSpacer euiSpacer--l\\"></div><div class=\\"euiSpacer euiSpacer--s\\"></div><div class=\\"euiFlexGroup euiFlexGroup--gutterMedium euiFlexGroup--alignItemsCenter euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><a class=\\"euiButton euiButton--primary euiButton--fill\\" href=\\"/path/to/logout\\" rel=\\"noreferrer\\" data-test-subj=\\"ResetSessionButton\\"><span class=\\"euiButtonContent euiButton__content\\"><span class=\\"euiButton__text\\">Log in as different user</span></span></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--primary\\" type=\\"button\\" id=\\"goBackButton\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\">Go back</span></span></button></div></div></div></div></main></div></body></html>"`;
diff --git a/x-pack/plugins/security_solution/public/cases/components/configure_cases/connectors_dropdown.test.tsx b/x-pack/plugins/security_solution/public/cases/components/configure_cases/connectors_dropdown.test.tsx
index a1d55ded22d77..ac3bae02872a8 100644
--- a/x-pack/plugins/security_solution/public/cases/components/configure_cases/connectors_dropdown.test.tsx
+++ b/x-pack/plugins/security_solution/public/cases/components/configure_cases/connectors_dropdown.test.tsx
@@ -76,6 +76,6 @@ describe('ConnectorsDropdown', () => {
       wrappingComponent: TestProviders,
     });
 
-    expect(newWrapper.find('button span').text()).toEqual('My Connector');
+    expect(newWrapper.find('button span:not([data-euiicon-type])').text()).toEqual('My Connector');
   });
 });
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/__snapshots__/trusted_app_deletion_dialog.test.tsx.snap b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/__snapshots__/trusted_app_deletion_dialog.test.tsx.snap
index 89f81948e166b..720bbb0b76164 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/__snapshots__/trusted_app_deletion_dialog.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/__snapshots__/trusted_app_deletion_dialog.test.tsx.snap
@@ -26,7 +26,7 @@ exports[`TrustedAppDeletionDialog renders correctly when deletion failed 1`] = `
           class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
           type="button"
         >
-          <div
+          <span
             aria-hidden="true"
             class="euiButtonIcon__icon"
             data-euiicon-type="cross"
@@ -127,7 +127,7 @@ exports[`TrustedAppDeletionDialog renders correctly when deletion is in progress
           class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
           type="button"
         >
-          <div
+          <span
             aria-hidden="true"
             class="euiButtonIcon__icon"
             data-euiicon-type="cross"
@@ -233,7 +233,7 @@ exports[`TrustedAppDeletionDialog renders correctly when dialog started 1`] = `
           class="euiButtonIcon euiButtonIcon--text euiModal__closeIcon"
           type="button"
         >
-          <div
+          <span
             aria-hidden="true"
             class="euiButtonIcon__icon"
             data-euiicon-type="cross"
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap
index 4276debbac3af..399509466e573 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_grid/__snapshots__/index.test.tsx.snap
@@ -42,7 +42,7 @@ exports[`TrustedAppsGrid renders correctly when failed loading data for the firs
         <div
           class="euiSpacer euiSpacer--m"
         />
-        <div
+        <span
           color="danger"
           data-euiicon-type="minusInCircle"
         />
@@ -71,7 +71,7 @@ exports[`TrustedAppsGrid renders correctly when failed loading data for the seco
         <div
           class="euiSpacer euiSpacer--m"
         />
-        <div
+        <span
           color="danger"
           data-euiicon-type="minusInCircle"
         />
@@ -2656,7 +2656,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                   <span
                     class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                   >
-                    <div
+                    <span
                       class="euiButtonContent__icon"
                       data-euiicon-type="arrowDown"
                     />
@@ -2685,7 +2685,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                 disabled=""
                 type="button"
               >
-                <div
+                <span
                   aria-hidden="true"
                   class="euiButtonIcon__icon"
                   data-euiicon-type="arrowLeft"
@@ -2829,7 +2829,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                 data-test-subj="pagination-button-next"
                 type="button"
               >
-                <div
+                <span
                   aria-hidden="true"
                   class="euiButtonIcon__icon"
                   data-euiicon-type="arrowRight"
@@ -5456,7 +5456,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                   <span
                     class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                   >
-                    <div
+                    <span
                       class="euiButtonContent__icon"
                       data-euiicon-type="arrowDown"
                     />
@@ -5485,7 +5485,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                 disabled=""
                 type="button"
               >
-                <div
+                <span
                   aria-hidden="true"
                   class="euiButtonIcon__icon"
                   data-euiicon-type="arrowLeft"
@@ -5629,7 +5629,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                 data-test-subj="pagination-button-next"
                 type="button"
               >
-                <div
+                <span
                   aria-hidden="true"
                   class="euiButtonIcon__icon"
                   data-euiicon-type="arrowRight"
@@ -8214,7 +8214,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                   <span
                     class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                   >
-                    <div
+                    <span
                       class="euiButtonContent__icon"
                       data-euiicon-type="arrowDown"
                     />
@@ -8242,7 +8242,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                 data-test-subj="pagination-button-previous"
                 type="button"
               >
-                <div
+                <span
                   aria-hidden="true"
                   class="euiButtonIcon__icon"
                   data-euiicon-type="arrowLeft"
@@ -8340,7 +8340,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                 data-test-subj="pagination-button-next"
                 type="button"
               >
-                <div
+                <span
                   aria-hidden="true"
                   class="euiButtonIcon__icon"
                   data-euiicon-type="arrowRight"
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_list/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_list/__snapshots__/index.test.tsx.snap
index 5f652b39ffd56..a56e71e8073cb 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_list/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_list/__snapshots__/index.test.tsx.snap
@@ -304,7 +304,7 @@ exports[`TrustedAppsList renders correctly when failed loading data for the firs
                 <span
                   class="euiTableCellContent__text"
                 >
-                  <div
+                  <span
                     color="danger"
                     data-euiicon-type="minusInCircle"
                   />
@@ -467,7 +467,7 @@ exports[`TrustedAppsList renders correctly when failed loading data for the seco
                 <span
                   class="euiTableCellContent__text"
                 >
-                  <div
+                  <span
                     color="danger"
                     data-euiicon-type="minusInCircle"
                   />
@@ -727,7 +727,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -755,7 +755,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowUp"
@@ -1114,7 +1114,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -1142,7 +1142,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -1243,7 +1243,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -1271,7 +1271,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -1372,7 +1372,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -1400,7 +1400,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -1501,7 +1501,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -1529,7 +1529,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -1630,7 +1630,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -1658,7 +1658,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -1759,7 +1759,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -1787,7 +1787,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -1888,7 +1888,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -1916,7 +1916,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -2017,7 +2017,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -2045,7 +2045,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -2146,7 +2146,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -2174,7 +2174,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -2275,7 +2275,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -2303,7 +2303,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -2404,7 +2404,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -2432,7 +2432,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -2533,7 +2533,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -2561,7 +2561,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -2662,7 +2662,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -2690,7 +2690,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -2791,7 +2791,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -2819,7 +2819,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -2920,7 +2920,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -2948,7 +2948,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -3049,7 +3049,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -3077,7 +3077,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -3178,7 +3178,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -3206,7 +3206,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -3307,7 +3307,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -3335,7 +3335,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -3436,7 +3436,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -3464,7 +3464,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -3500,7 +3500,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                 <span
                   class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                 >
-                  <div
+                  <span
                     class="euiButtonContent__icon"
                     data-euiicon-type="arrowDown"
                   />
@@ -3529,7 +3529,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
               disabled=""
               type="button"
             >
-              <div
+              <span
                 aria-hidden="true"
                 class="euiButtonIcon__icon"
                 data-euiicon-type="arrowLeft"
@@ -3686,7 +3686,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
               href="#mockId"
               rel="noreferrer"
             >
-              <div
+              <span
                 aria-hidden="true"
                 class="euiButtonIcon__icon"
                 data-euiicon-type="arrowRight"
@@ -3925,7 +3925,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -3953,7 +3953,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -4054,7 +4054,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -4082,7 +4082,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -4183,7 +4183,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -4211,7 +4211,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -4312,7 +4312,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -4340,7 +4340,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -4441,7 +4441,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -4469,7 +4469,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -4570,7 +4570,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -4598,7 +4598,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -4699,7 +4699,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -4727,7 +4727,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -4828,7 +4828,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -4856,7 +4856,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -4957,7 +4957,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -4985,7 +4985,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -5086,7 +5086,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -5114,7 +5114,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -5215,7 +5215,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -5243,7 +5243,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -5344,7 +5344,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -5372,7 +5372,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -5473,7 +5473,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -5501,7 +5501,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -5602,7 +5602,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -5630,7 +5630,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -5731,7 +5731,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -5759,7 +5759,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -5860,7 +5860,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -5888,7 +5888,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -5989,7 +5989,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -6017,7 +6017,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -6118,7 +6118,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -6146,7 +6146,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -6247,7 +6247,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -6275,7 +6275,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -6376,7 +6376,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -6404,7 +6404,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -6440,7 +6440,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                 <span
                   class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                 >
-                  <div
+                  <span
                     class="euiButtonContent__icon"
                     data-euiicon-type="arrowDown"
                   />
@@ -6469,7 +6469,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
               disabled=""
               type="button"
             >
-              <div
+              <span
                 aria-hidden="true"
                 class="euiButtonIcon__icon"
                 data-euiicon-type="arrowLeft"
@@ -6626,7 +6626,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
               href="#mockId"
               rel="noreferrer"
             >
-              <div
+              <span
                 aria-hidden="true"
                 class="euiButtonIcon__icon"
                 data-euiicon-type="arrowRight"
@@ -7023,7 +7023,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -7051,7 +7051,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -7152,7 +7152,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -7180,7 +7180,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -7281,7 +7281,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -7309,7 +7309,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -7410,7 +7410,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -7438,7 +7438,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -7539,7 +7539,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -7567,7 +7567,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -7668,7 +7668,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -7696,7 +7696,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -7797,7 +7797,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -7825,7 +7825,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -7926,7 +7926,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -7954,7 +7954,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -8055,7 +8055,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -8083,7 +8083,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -8184,7 +8184,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -8212,7 +8212,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -8313,7 +8313,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -8341,7 +8341,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -8442,7 +8442,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -8470,7 +8470,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -8571,7 +8571,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -8599,7 +8599,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -8700,7 +8700,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -8728,7 +8728,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -8829,7 +8829,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -8857,7 +8857,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -8958,7 +8958,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -8986,7 +8986,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -9087,7 +9087,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -9115,7 +9115,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -9216,7 +9216,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -9244,7 +9244,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -9345,7 +9345,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -9373,7 +9373,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -9474,7 +9474,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -9502,7 +9502,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -9538,7 +9538,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                 <span
                   class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                 >
-                  <div
+                  <span
                     class="euiButtonContent__icon"
                     data-euiicon-type="arrowDown"
                   />
@@ -9567,7 +9567,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
               disabled=""
               type="button"
             >
-              <div
+              <span
                 aria-hidden="true"
                 class="euiButtonIcon__icon"
                 data-euiicon-type="arrowLeft"
@@ -9724,7 +9724,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
               href="#mockId"
               rel="noreferrer"
             >
-              <div
+              <span
                 aria-hidden="true"
                 class="euiButtonIcon__icon"
                 data-euiicon-type="arrowRight"
@@ -9963,7 +9963,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -9991,7 +9991,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -10092,7 +10092,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -10120,7 +10120,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -10221,7 +10221,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -10249,7 +10249,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -10350,7 +10350,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -10378,7 +10378,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -10479,7 +10479,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -10507,7 +10507,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -10608,7 +10608,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -10636,7 +10636,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -10737,7 +10737,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -10765,7 +10765,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -10866,7 +10866,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -10894,7 +10894,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -10995,7 +10995,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -11023,7 +11023,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -11124,7 +11124,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -11152,7 +11152,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -11253,7 +11253,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -11281,7 +11281,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -11382,7 +11382,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -11410,7 +11410,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -11511,7 +11511,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -11539,7 +11539,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -11640,7 +11640,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -11668,7 +11668,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -11769,7 +11769,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -11797,7 +11797,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -11898,7 +11898,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -11926,7 +11926,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -12027,7 +12027,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -12055,7 +12055,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -12156,7 +12156,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -12184,7 +12184,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -12285,7 +12285,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -12313,7 +12313,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -12414,7 +12414,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     data-test-subj="trustedAppDeleteAction"
                     type="button"
                   >
-                    <div
+                    <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
                       data-euiicon-type="trash"
@@ -12442,7 +12442,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   data-test-subj="trustedAppsListItemExpandButton"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -12478,7 +12478,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                 <span
                   class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                 >
-                  <div
+                  <span
                     class="euiButtonContent__icon"
                     data-euiicon-type="arrowDown"
                   />
@@ -12508,7 +12508,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
               href="#mockId"
               rel="noreferrer"
             >
-              <div
+              <span
                 aria-hidden="true"
                 class="euiButtonIcon__icon"
                 data-euiicon-type="arrowLeft"
@@ -12615,7 +12615,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
               href="#mockId"
               rel="noreferrer"
             >
-              <div
+              <span
                 aria-hidden="true"
                 class="euiButtonIcon__icon"
                 data-euiicon-type="arrowRight"
diff --git a/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/cert_search.test.tsx.snap b/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/cert_search.test.tsx.snap
index f16ef6b5548b8..a56f3a3878295 100644
--- a/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/cert_search.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/cert_search.test.tsx.snap
@@ -16,7 +16,7 @@ exports[`CertificatesSearch renders expected elements for valid props 1`] = `
     >
       <input
         aria-label="Search certificates"
-        class="euiFieldSearch euiFieldSearch--fullWidth euiFieldSearch-isClearable"
+        class="euiFieldSearch euiFieldSearch--fullWidth"
         data-test-subj="uptimeCertSearch"
         placeholder="Search certificates"
         type="search"
@@ -27,7 +27,7 @@ exports[`CertificatesSearch renders expected elements for valid props 1`] = `
         <span
           class="euiFormControlLayoutCustomIcon"
         >
-          <div
+          <span
             aria-hidden="true"
             class="euiFormControlLayoutCustomIcon__icon"
             data-euiicon-type="search"
diff --git a/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/cert_status.test.tsx.snap b/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/cert_status.test.tsx.snap
index d64434c48837c..0a84278c32018 100644
--- a/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/cert_status.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/cert_status.test.tsx.snap
@@ -15,7 +15,7 @@ exports[`CertStatus renders expected elements for valid props 1`] = `
     <div
       class="euiFlexItem euiFlexItem--flexGrowZero"
     >
-      <div
+      <span
         color="success"
         data-euiicon-type="dot"
       />
diff --git a/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/fingerprint_col.test.tsx.snap b/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/fingerprint_col.test.tsx.snap
index 78c21e515c21e..22b1847b60edf 100644
--- a/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/fingerprint_col.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/certificates/__tests__/__snapshots__/fingerprint_col.test.tsx.snap
@@ -41,7 +41,7 @@ exports[`FingerprintCol renders expected elements for valid props 1`] = `
         title="Click to copy fingerprint value"
         type="button"
       >
-        <div
+        <span
           aria-hidden="true"
           class="euiButtonIcon__icon"
           data-euiicon-type="copy"
@@ -80,7 +80,7 @@ exports[`FingerprintCol renders expected elements for valid props 1`] = `
         title="Click to copy fingerprint value"
         type="button"
       >
-        <div
+        <span
           aria-hidden="true"
           class="euiButtonIcon__icon"
           data-euiicon-type="copy"
diff --git a/x-pack/plugins/uptime/public/components/common/__tests__/__snapshots__/uptime_date_picker.test.tsx.snap b/x-pack/plugins/uptime/public/components/common/__tests__/__snapshots__/uptime_date_picker.test.tsx.snap
index 883312110e5ee..c540334222418 100644
--- a/x-pack/plugins/uptime/public/components/common/__tests__/__snapshots__/uptime_date_picker.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/common/__tests__/__snapshots__/uptime_date_picker.test.tsx.snap
@@ -26,14 +26,14 @@ exports[`UptimeDatePicker component renders properly with mock data 1`] = `
             <span
               class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
             >
-              <div
+              <span
                 class="euiButtonContent__icon"
                 data-euiicon-type="arrowDown"
               />
               <span
                 class="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
               >
-                <div
+                <span
                   data-euiicon-type="clock"
                 />
               </span>
@@ -76,7 +76,7 @@ exports[`UptimeDatePicker component renders properly with mock data 1`] = `
         <span
           class="euiButtonContent euiButton__content"
         >
-          <div
+          <span
             class="euiButtonContent__icon"
             data-euiicon-type="refresh"
           />
diff --git a/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/donut_chart.test.tsx.snap b/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/donut_chart.test.tsx.snap
index 261f3a016d4db..cf00a8da35347 100644
--- a/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/donut_chart.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/common/charts/__tests__/__snapshots__/donut_chart.test.tsx.snap
@@ -477,7 +477,7 @@ exports[`DonutChart component renders a donut chart 1`] = `
               <div
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
-                <div
+                <span
                   color="#bd271e"
                   data-euiicon-type="dot"
                 />
@@ -518,7 +518,7 @@ exports[`DonutChart component renders a donut chart 1`] = `
               <div
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
-                <div
+                <span
                   color="#d3dae6"
                   data-euiicon-type="dot"
                 />
@@ -604,7 +604,7 @@ exports[`DonutChart component renders a green check when all monitors are up 1`]
         class="echContainer"
       />
     </div>
-    <div
+    <span
       class="c0 greenCheckIcon"
       data-euiicon-type="checkInCircleFilled"
     />
@@ -630,7 +630,7 @@ exports[`DonutChart component renders a green check when all monitors are up 1`]
               <div
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
-                <div
+                <span
                   color="#bd271e"
                   data-euiicon-type="dot"
                 />
@@ -671,7 +671,7 @@ exports[`DonutChart component renders a green check when all monitors are up 1`]
               <div
                 class="euiFlexItem euiFlexItem--flexGrowZero"
               >
-                <div
+                <span
                   color="#d3dae6"
                   data-euiicon-type="dot"
                 />
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/license_info.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/license_info.test.tsx.snap
index 0327b5b6d6f69..68e3606d880d6 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/license_info.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/license_info.test.tsx.snap
@@ -9,7 +9,7 @@ Array [
     <div
       class="euiCallOutHeader"
     >
-      <div
+      <span
         aria-hidden="true"
         class="euiCallOutHeader__icon"
         data-euiicon-type="help"
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_flyout.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_flyout.test.tsx.snap
index b2f69b1676fb5..ac1afccd1feae 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_flyout.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/__tests__/__snapshots__/ml_flyout.test.tsx.snap
@@ -95,7 +95,7 @@ exports[`ML Flyout component shows license info if no ml available 1`] = `
       data-test-subj="euiFlyoutCloseButton"
       type="button"
     >
-      <div
+      <span
         aria-hidden="true"
         class="euiButtonIcon__icon"
         data-euiicon-type="cross"
@@ -129,7 +129,7 @@ exports[`ML Flyout component shows license info if no ml available 1`] = `
             <div
               class="euiCallOutHeader"
             >
-              <div
+              <span
                 aria-hidden="true"
                 class="euiCallOutHeader__icon"
                 data-euiicon-type="help"
diff --git a/x-pack/plugins/uptime/public/components/monitor/ping_list/__tests__/__snapshots__/expanded_row.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ping_list/__tests__/__snapshots__/expanded_row.test.tsx.snap
index 11bdf134bd0e8..137d11d3f3b09 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ping_list/__tests__/__snapshots__/expanded_row.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/ping_list/__tests__/__snapshots__/expanded_row.test.tsx.snap
@@ -175,7 +175,7 @@ exports[`PingListExpandedRow renders link to docs if body is not recorded but it
                 target="_blank"
               >
                 docs 
-                <div
+                <span
                   data-euiicon-type="popout"
                 />
               </a>
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/__test__/__snapshots__/monitor_status.bar.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/status_details/__test__/__snapshots__/monitor_status.bar.test.tsx.snap
index 43e98a492dd6c..69c6bf3fadb1d 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/__test__/__snapshots__/monitor_status.bar.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/status_details/__test__/__snapshots__/monitor_status.bar.test.tsx.snap
@@ -52,7 +52,7 @@ Array [
         target="_blank"
       >
          
-        <div
+        <span
           data-euiicon-type="popout"
         />
       </a>
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/__test__/__snapshots__/ssl_certificate.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/status_details/__test__/__snapshots__/ssl_certificate.test.tsx.snap
index 64802ad383b79..aad3b03414be0 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/__test__/__snapshots__/ssl_certificate.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/status_details/__test__/__snapshots__/ssl_certificate.test.tsx.snap
@@ -38,7 +38,7 @@ Array [
         <div
           class="euiText euiText--small"
         >
-          <div
+          <span
             color="success"
             data-euiicon-type="lock"
           />
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/__snapshots__/location_status_tags.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/__snapshots__/location_status_tags.test.tsx.snap
index 6123773b48a05..84290ec02a64f 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/__snapshots__/location_status_tags.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__tests__/__snapshots__/location_status_tags.test.tsx.snap
@@ -1034,7 +1034,7 @@ exports[`LocationStatusTags component renders when there are many location 1`] =
               disabled=""
               type="button"
             >
-              <div
+              <span
                 aria-hidden="true"
                 class="euiButtonIcon__icon"
                 data-euiicon-type="arrowLeft"
@@ -1097,7 +1097,7 @@ exports[`LocationStatusTags component renders when there are many location 1`] =
               href="#generated-id"
               rel="noreferrer"
             >
-              <div
+              <span
                 aria-hidden="true"
                 class="euiButtonIcon__icon"
                 data-euiicon-type="arrowRight"
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/location_map/__tests__/__snapshots__/location_missing.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/status_details/location_map/__tests__/__snapshots__/location_missing.test.tsx.snap
index 3ac75b7e5efa3..f8a9bbb16cfa5 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/location_map/__tests__/__snapshots__/location_missing.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/status_details/location_map/__tests__/__snapshots__/location_missing.test.tsx.snap
@@ -28,7 +28,7 @@ exports[`LocationMissingWarning component renders correctly against snapshot 1`]
           <span
             class="euiButtonContent euiButton__content"
           >
-            <div
+            <span
               class="euiButtonContent__icon"
               data-euiicon-type="alert"
             />
diff --git a/x-pack/plugins/uptime/public/components/overview/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
index ae48aca39a6d5..024bd61eba33e 100644
--- a/x-pack/plugins/uptime/public/components/overview/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/overview/empty_state/__tests__/__snapshots__/empty_state.test.tsx.snap
@@ -269,7 +269,7 @@ exports[`EmptyState component does not render empty state with appropriate base
                         size="xxl"
                         type="logoUptime"
                       >
-                        <div
+                        <span
                           color="subdued"
                           data-euiicon-type="logoUptime"
                           size="xxl"
@@ -743,7 +743,7 @@ exports[`EmptyState component doesn't render child components when count is fals
                         size="xxl"
                         type="logoUptime"
                       >
-                        <div
+                        <span
                           color="subdued"
                           data-euiicon-type="logoUptime"
                           size="xxl"
@@ -1222,7 +1222,7 @@ exports[`EmptyState component notifies when index does not exist 1`] = `
                         size="xxl"
                         type="logoUptime"
                       >
-                        <div
+                        <span
                           color="subdued"
                           data-euiicon-type="logoUptime"
                           size="xxl"
@@ -1737,7 +1737,7 @@ exports[`EmptyState component renders error message when an error occurs 1`] = `
                         size="xxl"
                         type="securityApp"
                       >
-                        <div
+                        <span
                           color="subdued"
                           data-euiicon-type="securityApp"
                           size="xxl"
diff --git a/x-pack/plugins/uptime/public/components/overview/filter_group/__tests__/__snapshots__/filter_popover.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/filter_group/__tests__/__snapshots__/filter_popover.test.tsx.snap
index 63ba8bcf9d26a..5a7c9ecdf9d04 100644
--- a/x-pack/plugins/uptime/public/components/overview/filter_group/__tests__/__snapshots__/filter_popover.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/overview/filter_group/__tests__/__snapshots__/filter_popover.test.tsx.snap
@@ -100,7 +100,7 @@ exports[`FilterPopover component returns selected items on popover close 1`] = `
         <span
           class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
         >
-          <div
+          <span
             class="euiButtonContent__icon"
             data-euiicon-type="arrowDown"
           />
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
index e177f1cf01147..56a62b18785d8 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list.test.tsx.snap
@@ -1121,7 +1121,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
                         <div
                           class="euiFlexItem euiFlexItem--flexGrowZero"
                         >
-                          <div
+                          <span
                             color=""
                             data-euiicon-type="dot"
                           />
@@ -1201,7 +1201,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
                   type="button"
                 >
                    
-                  <div
+                  <span
                     color="subbdued"
                     data-euiicon-type="popout"
                   />
@@ -1304,7 +1304,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
                   data-test-subj="xpack.uptime.monitorList.foo.expandMonitorDetail"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -1344,7 +1344,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
                         <div
                           class="euiFlexItem euiFlexItem--flexGrowZero"
                         >
-                          <div
+                          <span
                             color=""
                             data-euiicon-type="dot"
                           />
@@ -1424,7 +1424,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
                   type="button"
                 >
                    
-                  <div
+                  <span
                     color="subbdued"
                     data-euiicon-type="popout"
                   />
@@ -1527,7 +1527,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
                   data-test-subj="xpack.uptime.monitorList.bar.expandMonitorDetail"
                   type="button"
                 >
-                  <div
+                  <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
                     data-euiicon-type="arrowDown"
@@ -1563,7 +1563,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
             <span
               class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
             >
-              <div
+              <span
                 class="euiButtonContent__icon"
                 data-euiicon-type="arrowDown"
               />
@@ -1593,7 +1593,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
             disabled=""
             type="button"
           >
-            <div
+            <span
               aria-hidden="true"
               class="euiButtonIcon__icon"
               data-euiicon-type="arrowLeft"
@@ -1610,7 +1610,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
             disabled=""
             type="button"
           >
-            <div
+            <span
               aria-hidden="true"
               class="euiButtonIcon__icon"
               data-euiicon-type="arrowRight"
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list_status_column.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list_status_column.test.tsx.snap
index f0e72d4060080..4a2e7b69f6b09 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list_status_column.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/__tests__/__snapshots__/monitor_list_status_column.test.tsx.snap
@@ -205,7 +205,7 @@ exports[`MonitorListStatusColumn will render display location status 1`] = `
         <div
           class="euiFlexItem euiFlexItem--flexGrowZero"
         >
-          <div
+          <span
             color="success"
             data-euiicon-type="dot"
           />
diff --git a/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/page_header.test.tsx.snap b/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/page_header.test.tsx.snap
index 6d0b90e29269b..15389460517de 100644
--- a/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/page_header.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/pages/__tests__/__snapshots__/page_header.test.tsx.snap
@@ -16,7 +16,7 @@ Array [
     <div
       class="euiCallOutHeader"
     >
-      <div
+      <span
         aria-hidden="true"
         class="euiCallOutHeader__icon"
         data-euiicon-type="beaker"
@@ -142,7 +142,7 @@ Array [
                 <span
                   class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                 >
-                  <div
+                  <span
                     class="euiButtonContent__icon"
                     data-euiicon-type="arrowDown"
                   />
@@ -168,7 +168,7 @@ Array [
             <span
               class="euiButtonContent euiButtonEmpty__content"
             >
-              <div
+              <span
                 class="euiButtonContent__icon"
                 data-euiicon-type="gear"
               />
@@ -190,7 +190,7 @@ Array [
             <span
               class="euiButtonContent euiButtonEmpty__content"
             >
-              <div
+              <span
                 class="euiButtonContent__icon"
                 data-euiicon-type="plusInCircle"
               />
@@ -233,14 +233,14 @@ Array [
                   <span
                     class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                   >
-                    <div
+                    <span
                       class="euiButtonContent__icon"
                       data-euiicon-type="arrowDown"
                     />
                     <span
                       class="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
                     >
-                      <div
+                      <span
                         data-euiicon-type="clock"
                       />
                     </span>
@@ -283,7 +283,7 @@ Array [
               <span
                 class="euiButtonContent euiButton__content"
               >
-                <div
+                <span
                   class="euiButtonContent__icon"
                   data-euiicon-type="refresh"
                 />
@@ -329,7 +329,7 @@ Array [
     <div
       class="euiCallOutHeader"
     >
-      <div
+      <span
         aria-hidden="true"
         class="euiCallOutHeader__icon"
         data-euiicon-type="beaker"
@@ -460,14 +460,14 @@ Array [
                   <span
                     class="euiButtonContent euiButtonContent--iconRight euiButtonEmpty__content"
                   >
-                    <div
+                    <span
                       class="euiButtonContent__icon"
                       data-euiicon-type="arrowDown"
                     />
                     <span
                       class="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
                     >
-                      <div
+                      <span
                         data-euiicon-type="clock"
                       />
                     </span>
@@ -510,7 +510,7 @@ Array [
               <span
                 class="euiButtonContent euiButton__content"
               >
-                <div
+                <span
                   class="euiButtonContent__icon"
                   data-euiicon-type="refresh"
                 />
@@ -548,7 +548,7 @@ Array [
     <div
       class="euiCallOutHeader"
     >
-      <div
+      <span
         aria-hidden="true"
         class="euiCallOutHeader__icon"
         data-euiicon-type="beaker"
diff --git a/yarn.lock b/yarn.lock
index 4ed8f513da7da..44c59d0264ddf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1268,10 +1268,10 @@
   resolved "https://registry.yarnpkg.com/@elastic/eslint-plugin-eui/-/eslint-plugin-eui-0.0.2.tgz#56b9ef03984a05cc213772ae3713ea8ef47b0314"
   integrity sha512-IoxURM5zraoQ7C8f+mJb9HYSENiZGgRVcG4tLQxE61yHNNRDXtGDWTZh8N1KIHcsqN1CEPETjuzBXkJYF/fDiQ==
 
-"@elastic/eui@29.3.0":
-  version "29.3.0"
-  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-29.3.0.tgz#5fd74110d9e3c9634566b37f5696947bce27c083"
-  integrity sha512-Ga/IsPXQajmYySliuGmux1UgqIQWNZssoCdT6ZGylZSVMdiKk+TJTh06eebGoTLrMXBJcNRV3JauQxeErQaarw==
+"@elastic/eui@29.5.0":
+  version "29.5.0"
+  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-29.5.0.tgz#024e6c60c6468bbcccd7ce68bf8526e0db7d8598"
+  integrity sha512-Hgb+NF4jYs0VmsfTgC25l3cW0Ki15YxOjZc7DHaSM+SI6bnW7+3d31BZI4ioGcL6Fy8Bpc7OHEdLJijKNiaPCA==
   dependencies:
     "@types/chroma-js" "^2.0.0"
     "@types/lodash" "^4.14.160"

From 8e5d6728c7b418383e98d95eda6c7ec72a73ee3b Mon Sep 17 00:00:00 2001
From: Chandler Prall <chandler.prall@gmail.com>
Date: Thu, 15 Oct 2020 14:54:29 -0600
Subject: [PATCH 2/5] Cleaned up some types

---
 .../components/timeline/body/actions/action_icon_item.tsx       | 2 +-
 .../public/management/edit_space/delete_spaces_button.tsx       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/action_icon_item.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/action_icon_item.tsx
index 64f8ce3727f39..12cfbbc04222f 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/action_icon_item.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/body/actions/action_icon_item.tsx
@@ -28,7 +28,7 @@ const ActionIconItemComponent: React.FC<ActionIconItemProps> = ({
   dataTestSubj,
   content,
   ariaLabel,
-  iconType,
+  iconType = '',
   isDisabled = false,
   onClick,
   children,
diff --git a/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx b/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
index ea63905e27b26..cf131b4c64029 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
@@ -42,7 +42,7 @@ export class DeleteSpacesButton extends Component<Props, State> {
 
     let ButtonComponent: any = EuiButton;
 
-    const extraProps: EuiButtonIconProps = {};
+    const extraProps: Partial<EuiButtonIconProps> = {};
 
     if (this.props.style === 'icon') {
       ButtonComponent = EuiButtonIcon;

From 5c5ef907fdbe833fcdb7b750b59910523b920095 Mon Sep 17 00:00:00 2001
From: Chandler Prall <chandler.prall@gmail.com>
Date: Fri, 16 Oct 2020 08:52:27 -0600
Subject: [PATCH 3/5] addresses feedback on types change

---
 .../public/management/edit_space/delete_spaces_button.tsx     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx b/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
index cf131b4c64029..a03d42d10c30f 100644
--- a/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
+++ b/x-pack/plugins/spaces/public/management/edit_space/delete_spaces_button.tsx
@@ -42,11 +42,11 @@ export class DeleteSpacesButton extends Component<Props, State> {
 
     let ButtonComponent: any = EuiButton;
 
-    const extraProps: Partial<EuiButtonIconProps> = {};
+    let extraProps: EuiButtonIconProps | undefined;
 
     if (this.props.style === 'icon') {
       ButtonComponent = EuiButtonIcon;
-      extraProps.iconType = 'trash';
+      extraProps = { iconType: 'trash' };
     }
 
     return (

From 74659449b31518062967e429471e0a7274211740 Mon Sep 17 00:00:00 2001
From: Chandler Prall <chandler.prall@gmail.com>
Date: Fri, 16 Oct 2020 09:03:26 -0600
Subject: [PATCH 4/5] Update EuiIcon snapshots in jest integration tests

---
 .../integration_tests/router.test.tsx            | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/core/public/application/integration_tests/router.test.tsx b/src/core/public/application/integration_tests/router.test.tsx
index d982136422268..8ae559742c0da 100644
--- a/src/core/public/application/integration_tests/router.test.tsx
+++ b/src/core/public/application/integration_tests/router.test.tsx
@@ -107,7 +107,7 @@ describe('AppRouter', () => {
 
     expect(app1.mounter.mount).toHaveBeenCalled();
     expect(dom?.html()).toMatchInlineSnapshot(`
-      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingElastic euiLoadingElastic--xxLarge\\" aria-label=\\"Loading application\\"><div data-euiicon-type=\\"logoElastic\\"></div></span></div><div><div>
+      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingElastic euiLoadingElastic--xxLarge\\" aria-label=\\"Loading application\\"><span data-euiicon-type=\\"logoElastic\\"></span></span></div><div><div>
       basename: /app/app1
       html: <span>App 1</span>
       </div></div>"
@@ -119,7 +119,7 @@ describe('AppRouter', () => {
     expect(app1Unmount).toHaveBeenCalled();
     expect(app2.mounter.mount).toHaveBeenCalled();
     expect(dom?.html()).toMatchInlineSnapshot(`
-      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingElastic euiLoadingElastic--xxLarge\\" aria-label=\\"Loading application\\"><div data-euiicon-type=\\"logoElastic\\"></div></span></div><div><div>
+      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingElastic euiLoadingElastic--xxLarge\\" aria-label=\\"Loading application\\"><span data-euiicon-type=\\"logoElastic\\"></span></span></div><div><div>
       basename: /app/app2
       html: <div>App 2</div>
       </div></div>"
@@ -133,7 +133,7 @@ describe('AppRouter', () => {
 
     expect(standardApp.mounter.mount).toHaveBeenCalled();
     expect(dom?.html()).toMatchInlineSnapshot(`
-      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingElastic euiLoadingElastic--xxLarge\\" aria-label=\\"Loading application\\"><div data-euiicon-type=\\"logoElastic\\"></div></span></div><div><div>
+      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingElastic euiLoadingElastic--xxLarge\\" aria-label=\\"Loading application\\"><span data-euiicon-type=\\"logoElastic\\"></span></span></div><div><div>
       basename: /app/app1
       html: <span>App 1</span>
       </div></div>"
@@ -145,7 +145,7 @@ describe('AppRouter', () => {
     expect(standardAppUnmount).toHaveBeenCalled();
     expect(chromelessApp.mounter.mount).toHaveBeenCalled();
     expect(dom?.html()).toMatchInlineSnapshot(`
-      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingElastic euiLoadingElastic--xxLarge\\" aria-label=\\"Loading application\\"><div data-euiicon-type=\\"logoElastic\\"></div></span></div><div><div>
+      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingElastic euiLoadingElastic--xxLarge\\" aria-label=\\"Loading application\\"><span data-euiicon-type=\\"logoElastic\\"></span></span></div><div><div>
       basename: /chromeless-a/path
       html: <div>Chromeless A</div>
       </div></div>"
@@ -157,7 +157,7 @@ describe('AppRouter', () => {
     expect(chromelessAppUnmount).toHaveBeenCalled();
     expect(standardApp.mounter.mount).toHaveBeenCalledTimes(2);
     expect(dom?.html()).toMatchInlineSnapshot(`
-      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingElastic euiLoadingElastic--xxLarge\\" aria-label=\\"Loading application\\"><div data-euiicon-type=\\"logoElastic\\"></div></span></div><div><div>
+      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingElastic euiLoadingElastic--xxLarge\\" aria-label=\\"Loading application\\"><span data-euiicon-type=\\"logoElastic\\"></span></span></div><div><div>
       basename: /app/app1
       html: <span>App 1</span>
       </div></div>"
@@ -171,7 +171,7 @@ describe('AppRouter', () => {
 
     expect(chromelessAppA.mounter.mount).toHaveBeenCalled();
     expect(dom?.html()).toMatchInlineSnapshot(`
-      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingElastic euiLoadingElastic--xxLarge\\" aria-label=\\"Loading application\\"><div data-euiicon-type=\\"logoElastic\\"></div></span></div><div><div>
+      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingElastic euiLoadingElastic--xxLarge\\" aria-label=\\"Loading application\\"><span data-euiicon-type=\\"logoElastic\\"></span></span></div><div><div>
       basename: /chromeless-a/path
       html: <div>Chromeless A</div>
       </div></div>"
@@ -183,7 +183,7 @@ describe('AppRouter', () => {
     expect(chromelessAppAUnmount).toHaveBeenCalled();
     expect(chromelessAppB.mounter.mount).toHaveBeenCalled();
     expect(dom?.html()).toMatchInlineSnapshot(`
-      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingElastic euiLoadingElastic--xxLarge\\" aria-label=\\"Loading application\\"><div data-euiicon-type=\\"logoElastic\\"></div></span></div><div><div>
+      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingElastic euiLoadingElastic--xxLarge\\" aria-label=\\"Loading application\\"><span data-euiicon-type=\\"logoElastic\\"></span></span></div><div><div>
       basename: /chromeless-b/path
       html: <div>Chromeless B</div>
       </div></div>"
@@ -195,7 +195,7 @@ describe('AppRouter', () => {
     expect(chromelessAppBUnmount).toHaveBeenCalled();
     expect(chromelessAppA.mounter.mount).toHaveBeenCalledTimes(2);
     expect(dom?.html()).toMatchInlineSnapshot(`
-      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingElastic euiLoadingElastic--xxLarge\\" aria-label=\\"Loading application\\"><div data-euiicon-type=\\"logoElastic\\"></div></span></div><div><div>
+      "<div class=\\"appContainer__loading\\"><span class=\\"euiLoadingElastic euiLoadingElastic--xxLarge\\" aria-label=\\"Loading application\\"><span data-euiicon-type=\\"logoElastic\\"></span></span></div><div><div>
       basename: /chromeless-a/path
       html: <div>Chromeless A</div>
       </div></div>"

From affd2c05f6de112e05f78cc544c0f9aed2459690 Mon Sep 17 00:00:00 2001
From: Chandler Prall <chandler.prall@gmail.com>
Date: Mon, 19 Oct 2020 11:48:59 -0600
Subject: [PATCH 5/5] Updated snapshot from rebasing on master

---
 .../ui/header/__snapshots__/header.test.tsx.snap   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
index 97e9ffa42fc88..34c5f213a7221 100644
--- a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
+++ b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
@@ -3028,7 +3028,7 @@ exports[`Header renders 1`] = `
                           size="l"
                           type="logoElastic"
                         >
-                          <div
+                          <span
                             aria-label="Elastic Logo"
                             className="chrHeaderLogo__cluster"
                             data-euiicon-type="logoElastic"
@@ -4743,7 +4743,7 @@ exports[`Header renders 1`] = `
                                     size="m"
                                     type="help"
                                   >
-                                    <div
+                                    <span
                                       data-euiicon-type="help"
                                       size="m"
                                     />
@@ -4863,7 +4863,7 @@ exports[`Header renders 1`] = `
                         size="m"
                         type="menu"
                       >
-                        <div
+                        <span
                           data-euiicon-type="menu"
                           size="m"
                         />
@@ -5694,7 +5694,7 @@ exports[`Header renders 1`] = `
                                     className="euiListGroupItem__icon"
                                     type="home"
                                   >
-                                    <div
+                                    <span
                                       className="euiListGroupItem__icon"
                                       data-euiicon-type="home"
                                     />
@@ -5780,7 +5780,7 @@ exports[`Header renders 1`] = `
                             size="m"
                             type="arrowRight"
                           >
-                            <div
+                            <span
                               className="euiAccordion__icon euiAccordion__icon-isOpen"
                               data-euiicon-type="arrowRight"
                               size="m"
@@ -6002,7 +6002,7 @@ exports[`Header renders 1`] = `
                                       data-test-subj="collapsible-nav-lock"
                                       type="button"
                                     >
-                                      <div
+                                      <span
                                         class="euiListGroupItem__icon"
                                         data-euiicon-type="lock"
                                       />
@@ -6037,7 +6037,7 @@ exports[`Header renders 1`] = `
                                       className="euiListGroupItem__icon"
                                       type="lock"
                                     >
-                                      <div
+                                      <span
                                         className="euiListGroupItem__icon"
                                         data-euiicon-type="lock"
                                       />