diff --git a/.cypress/integration/datasources_test/datasources.spec.js b/.cypress/integration/datasources_test/datasources.spec.js
deleted file mode 100644
index fdfe21b285..0000000000
--- a/.cypress/integration/datasources_test/datasources.spec.js
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright OpenSearch Contributors
- * SPDX-License-Identifier: Apache-2.0
- */
-
-/// <reference types="cypress" />
-
-  
-  const moveToDatasourcesHome = () => {
-    cy.visit(`${Cypress.env('opensearchDashboards')}/app/datasources`);
-  };
-
-  const moveToNewDatasourcesPage = () => {
-    cy.visit(`${Cypress.env('opensearchDashboards')}/app/datasources#/new`);
-  };
-
-  const moveToCreatePrometheusDatasourcePage = () => {
-    cy.visit(`${Cypress.env('opensearchDashboards')}/app/datasources#/configure/PROMETHEUS`);
-  };
-  
-  describe('Integration tests for datasources plugin', () => {
-    const testPrometheusSuffix = (Math.random() + 1).toString(36).substring(7);
-const testPrometheusInstance = `Prometheus_${testPrometheusSuffix}`;
-const testS3Suffix = (Math.random() + 1).toString(36).substring(7);
-const testS3Instance = `S3_${testS3Suffix}`;
-    it('Navigates to datasources plugin and expects the correct header', () => {
-      moveToDatasourcesHome();
-      cy.get('[data-test-subj="dataconnections-header"]').should('exist');
-    });
-
-    it('Tests navigation between tabs and goes to Prometheus creation flow', () => {
-      moveToDatasourcesHome();
-      cy.get('[data-test-subj="new"]').click();
-      cy.url().should('include', '/new')
-      cy.get('[data-test-subj="datasource_card_prometheus"]').click();
-      cy.url().should('include', '/configure/PROMETHEUS');
-    });
-
-});
-
-  
-  
diff --git a/.cypress/integration/datasources_test/datasources_basic_ui.spec.js b/.cypress/integration/datasources_test/datasources_basic_ui.spec.js
new file mode 100644
index 0000000000..4f9259ef5e
--- /dev/null
+++ b/.cypress/integration/datasources_test/datasources_basic_ui.spec.js
@@ -0,0 +1,67 @@
+/*
+ * Copyright OpenSearch Contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { FONTEND_BASE_PATH, DATASOURCES_API_PREFIX, DATASOURCES_PATH } from '../../utils/constants';
+
+const MANAGE_DATASOURCES_TAG = 'button[data-test-subj="manage"]';
+const NEW_DATASOURCES_TAG = 'button[data-test-subj="new"]';
+const CREATE_S3_BUTTON = '[data-test-subj="datasource_card_s3glue"]';
+const CREATE_PROMETHEUS_BUTTON = '[data-test-subj="datasource_card_prometheus"]';
+
+const visitDatasourcesHomePage = () => {
+  cy.visit(FONTEND_BASE_PATH + DATASOURCES_API_PREFIX);
+};
+
+const visitDatasourcesCreationPage = () => {
+  cy.visit(FONTEND_BASE_PATH + DATASOURCES_PATH.DATASOURCES_CREATION_BASE);
+};
+
+describe('Integration tests for datasources plugin', () => {
+  it('Navigates to datasources plugin and expects the correct header', () => {
+    visitDatasourcesHomePage();
+    cy.get('[data-test-subj="dataconnections-header"]').should('exist');
+  });
+
+  it('Tests navigation between tabs', () => {
+    visitDatasourcesHomePage();
+
+    cy.get(MANAGE_DATASOURCES_TAG)
+      .should('have.class', 'euiTab-isSelected')
+      .and('have.attr', 'aria-selected', 'true');
+    cy.get(MANAGE_DATASOURCES_TAG).click();
+    cy.url().should('include', '/manage');
+
+    cy.get(NEW_DATASOURCES_TAG).click();
+    cy.get(NEW_DATASOURCES_TAG)
+      .should('have.class', 'euiTab-isSelected')
+      .and('have.attr', 'aria-selected', 'true');
+    cy.url().should('include', '/new');
+
+    cy.get(CREATE_S3_BUTTON).should('be.visible');
+    cy.get(CREATE_PROMETHEUS_BUTTON).should('be.visible');
+  });
+
+  it('Tests navigation of S3 datasources creation page with hash', () => {
+    visitDatasourcesCreationPage();
+
+    cy.get(CREATE_S3_BUTTON).should('be.visible').click();
+    cy.url().should('include', DATASOURCES_PATH.DATASOURCES_CONFIG_BASE + '/AmazonS3AWSGlue');
+
+    cy.get('h1.euiTitle.euiTitle--medium')
+      .should('be.visible')
+      .and('contain', 'Configure Amazon S3 data source');
+  });
+
+  it('Tests navigation of Prometheus datasources creation page with hash', () => {
+    visitDatasourcesCreationPage();
+
+    cy.get(CREATE_PROMETHEUS_BUTTON).should('be.visible').click();
+    cy.url().should('include', DATASOURCES_PATH.DATASOURCES_CONFIG_BASE + '/Prometheus');
+
+    cy.get('h4.euiTitle.euiTitle--medium')
+      .should('be.visible')
+      .and('contain', 'Configure Prometheus data source');
+  });
+});
diff --git a/.cypress/utils/constants.js b/.cypress/utils/constants.js
index af655fbe3e..706061baff 100644
--- a/.cypress/utils/constants.js
+++ b/.cypress/utils/constants.js
@@ -6,6 +6,17 @@
 export const delay = 1500;
 export const COMMAND_TIMEOUT_LONG = 10000;
 
+//BASE Constants
+export const BACKEND_BASE_PATH = Cypress.env('opensearch');
+export const FONTEND_BASE_PATH = Cypress.env('opensearchDashboards');
+
+//Datasources API Constants
+export const DATASOURCES_API_PREFIX = '/app/datasources';
+export const DATASOURCES_PATH = {
+  DATASOURCES_CREATION_BASE: `${DATASOURCES_API_PREFIX}#/new`,
+  DATASOURCES_CONFIG_BASE: `${DATASOURCES_API_PREFIX}#/configure`
+};
+
 // trace analytics
 export const TRACE_ID = '8832ed6abbb2a83516461960c89af49d';
 export const SPAN_ID = 'a673bc074b438374';
diff --git a/.github/workflows/integration-tests-workflow.yml b/.github/workflows/integration-tests-workflow.yml
index 2ee8a85ecb..d1179a6e2d 100644
--- a/.github/workflows/integration-tests-workflow.yml
+++ b/.github/workflows/integration-tests-workflow.yml
@@ -109,6 +109,15 @@ jobs:
           node-version: ${{ steps.versions_step.outputs.node_version }}
           registry-url: 'https://registry.npmjs.org'
 
+      - name: Configure OpenSearch Dashboards
+        run: |
+          rm -rf ./config/opensearch_dashboards.yml
+          cat << 'EOT' > ./config/opensearch_dashboards.yml
+          server.host: "0.0.0.0"
+          home.disableWelcomeScreen: true
+          EOT
+        working-directory: OpenSearch-Dashboards
+
       - name: Install correct yarn version for OpenSearch Dashboards
         run: |
           npm uninstall -g yarn
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index f26802c597..22d20d68da 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -48,25 +48,32 @@ jobs:
         working-directory: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
         run: yarn osd bootstrap
 
-      - name: Get list of changed files
-        id: files
+      - name: Get list of changed files using GitHub Action
+        uses: lots0logs/gh-action-get-changed-files@2.2.2
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Check Changes of Files
         run: |
-          BASE_SHA="${{ github.event.pull_request.base.sha }}"
-          HEAD_SHA="${{ github.event.pull_request.head.sha }}"
-          git fetch origin $BASE_SHA
-          git diff --name-only $BASE_SHA...$HEAD_SHA > changed_files.txt
-          CHANGED_FILES=$(cat changed_files.txt | grep -E '\.(js|ts|tsx)$' || true)
-          echo "::set-output name=changed::${CHANGED_FILES}"
-        working-directory: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
+          echo "FILES_MODIFIED=$(cat ${HOME}/files_modified.json)"
+          echo "FILES_ADDED=$(cat ${HOME}/files_added.json)"
+          echo "FILES_RENAMED=$(cat ${HOME}/files_renamed.json)"
+          echo "FILES_DELETED=$(cat ${HOME}/files_deleted.json)"
 
       - name: Lint Changed Files
         run: |
-          CHANGED_FILES="${{ steps.files.outputs.changed }}"
+          jq -r '.[]' ${HOME}/files_modified.json ${HOME}/files_added.json | sort | uniq > /tmp/changed_files.txt
+          CHANGED_FILES=$(cat /tmp/changed_files.txt)
+          echo "These are the changed files: $CHANGED_FILES"
           if [[ -n "$CHANGED_FILES" ]]; then
             echo "Linting changed files..."
-            IFS=$'\n' read -r -a FILES_TO_LINT <<< "$CHANGED_FILES"
-            yarn lint "${FILES_TO_LINT[@]}"
+            while IFS= read -r file; do
+              if [[ $file == *.js || $file == *.ts || $file == *.tsx ]]; then
+                echo "linting file $file"
+                yarn lint "$file"
+              fi
+            done < /tmp/changed_files.txt
           else
             echo "No matched files to lint."
           fi
-        working-directory: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}
+        working-directory: OpenSearch-Dashboards/plugins/${{ env.PLUGIN_NAME }}      
diff --git a/cypress.config.js b/cypress.config.js
index dff98e5eb8..84ad089460 100644
--- a/cypress.config.js
+++ b/cypress.config.js
@@ -18,14 +18,12 @@ module.exports = defineConfig({
   env: {
     opensearch: 'localhost:9200',
     opensearchDashboards: 'localhost:5601',
-    security_enabled: true,
+    security_enabled: false,
   },
   'cypress-watch-and-reload': {
     watch: ['common/**', 'public/**', 'server/**'],
   },
   e2e: {
-    // We've imported your old cypress plugins here.
-    // You may want to clean this up later by importing these.
     setupNodeEvents(on, config) {
       return require('./.cypress/plugins/index.js')(on, config);
     },
diff --git a/public/components/common/live_tail/__tests__/__snapshots__/live_tail_button.test.tsx.snap b/public/components/common/live_tail/__tests__/__snapshots__/live_tail_button.test.tsx.snap
index 3e8c7b716a..d16f1b4662 100644
--- a/public/components/common/live_tail/__tests__/__snapshots__/live_tail_button.test.tsx.snap
+++ b/public/components/common/live_tail/__tests__/__snapshots__/live_tail_button.test.tsx.snap
@@ -150,7 +150,7 @@ exports[`Live tail button starts live tail with 5s interval 1`] = `
               size="m"
               type="stop"
             >
-              <EuiIconEmpty
+              <EuiIconBeaker
                 aria-hidden={true}
                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                 focusable="false"
@@ -167,8 +167,12 @@ exports[`Live tail button starts live tail with 5s interval 1`] = `
                   viewBox="0 0 16 16"
                   width={16}
                   xmlns="http://www.w3.org/2000/svg"
-                />
-              </EuiIconEmpty>
+                >
+                  <path
+                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                  />
+                </svg>
+              </EuiIconBeaker>
             </EuiIcon>
             <span
               className="euiButton__text"
diff --git a/public/components/common/search/__tests__/__snapshots__/search.test.tsx.snap b/public/components/common/search/__tests__/__snapshots__/search.test.tsx.snap
index c227af5246..4e2dfbde7a 100644
--- a/public/components/common/search/__tests__/__snapshots__/search.test.tsx.snap
+++ b/public/components/common/search/__tests__/__snapshots__/search.test.tsx.snap
@@ -107,7 +107,7 @@ exports[`Explorer Search component renders basic component 1`] = `
                                 size="m"
                                 type="arrowDown"
                               >
-                                <EuiIconEmpty
+                                <EuiIconBeaker
                                   aria-hidden={true}
                                   className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                   focusable="false"
@@ -124,8 +124,12 @@ exports[`Explorer Search component renders basic component 1`] = `
                                     viewBox="0 0 16 16"
                                     width={16}
                                     xmlns="http://www.w3.org/2000/svg"
-                                  />
-                                </EuiIconEmpty>
+                                  >
+                                    <path
+                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                    />
+                                  </svg>
+                                </EuiIconBeaker>
                               </EuiIcon>
                               <span
                                 className="euiButton__text"
@@ -556,7 +560,7 @@ exports[`Explorer Search component renders basic component 1`] = `
                                                 size="s"
                                                 type="arrowDown"
                                               >
-                                                <EuiIconEmpty
+                                                <EuiIconBeaker
                                                   aria-hidden={true}
                                                   className="euiIcon euiIcon--small euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                   focusable="false"
@@ -573,8 +577,12 @@ exports[`Explorer Search component renders basic component 1`] = `
                                                     viewBox="0 0 16 16"
                                                     width={16}
                                                     xmlns="http://www.w3.org/2000/svg"
-                                                  />
-                                                </EuiIconEmpty>
+                                                  >
+                                                    <path
+                                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                    />
+                                                  </svg>
+                                                </EuiIconBeaker>
                                               </EuiIcon>
                                               <span
                                                 className="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
@@ -582,7 +590,7 @@ exports[`Explorer Search component renders basic component 1`] = `
                                                 <EuiIcon
                                                   type="calendar"
                                                 >
-                                                  <EuiIconEmpty
+                                                  <EuiIconBeaker
                                                     aria-hidden={true}
                                                     className="euiIcon euiIcon--medium euiIcon-isLoading"
                                                     focusable="false"
@@ -599,8 +607,12 @@ exports[`Explorer Search component renders basic component 1`] = `
                                                       viewBox="0 0 16 16"
                                                       width={16}
                                                       xmlns="http://www.w3.org/2000/svg"
-                                                    />
-                                                  </EuiIconEmpty>
+                                                    >
+                                                      <path
+                                                        d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                      />
+                                                    </svg>
+                                                  </EuiIconBeaker>
                                                 </EuiIcon>
                                               </span>
                                             </span>
@@ -746,7 +758,7 @@ exports[`Explorer Search component renders basic component 1`] = `
                                             size="m"
                                             type="refresh"
                                           >
-                                            <EuiIconEmpty
+                                            <EuiIconBeaker
                                               aria-hidden={true}
                                               className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                               focusable="false"
@@ -763,8 +775,12 @@ exports[`Explorer Search component renders basic component 1`] = `
                                                 viewBox="0 0 16 16"
                                                 width={16}
                                                 xmlns="http://www.w3.org/2000/svg"
-                                              />
-                                            </EuiIconEmpty>
+                                              >
+                                                <path
+                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                />
+                                              </svg>
+                                            </EuiIconBeaker>
                                           </EuiIcon>
                                           <span
                                             className="euiButton__text euiSuperUpdateButton__text"
@@ -868,7 +884,7 @@ exports[`Explorer Search component renders basic component 1`] = `
                                   size="m"
                                   type="play"
                                 >
-                                  <EuiIconEmpty
+                                  <EuiIconBeaker
                                     aria-hidden={true}
                                     className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                     focusable="false"
@@ -885,8 +901,12 @@ exports[`Explorer Search component renders basic component 1`] = `
                                       viewBox="0 0 16 16"
                                       width={16}
                                       xmlns="http://www.w3.org/2000/svg"
-                                    />
-                                  </EuiIconEmpty>
+                                    >
+                                      <path
+                                        d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                      />
+                                    </svg>
+                                  </EuiIconBeaker>
                                 </EuiIcon>
                                 <span
                                   className="euiButton__text"
diff --git a/public/components/custom_panels/__tests__/__snapshots__/custom_panel_table.test.tsx.snap b/public/components/custom_panels/__tests__/__snapshots__/custom_panel_table.test.tsx.snap
index e923079d1e..a84231231f 100644
--- a/public/components/custom_panels/__tests__/__snapshots__/custom_panel_table.test.tsx.snap
+++ b/public/components/custom_panels/__tests__/__snapshots__/custom_panel_table.test.tsx.snap
@@ -177,7 +177,7 @@ exports[`Panels Table Component renders empty panel table container 1`] = `
                                           size="s"
                                           type="popout"
                                         >
-                                          <EuiIconEmpty
+                                          <EuiIconBeaker
                                             aria-hidden={true}
                                             aria-label="External link"
                                             className="euiIcon euiIcon--small euiIcon-isLoading euiLink__externalIcon"
@@ -196,8 +196,12 @@ exports[`Panels Table Component renders empty panel table container 1`] = `
                                               viewBox="0 0 16 16"
                                               width={16}
                                               xmlns="http://www.w3.org/2000/svg"
-                                            />
-                                          </EuiIconEmpty>
+                                            >
+                                              <path
+                                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                              />
+                                            </svg>
+                                          </EuiIconBeaker>
                                         </EuiIcon>
                                       </a>
                                     </EuiLink>
@@ -294,7 +298,7 @@ exports[`Panels Table Component renders empty panel table container 1`] = `
                                                       size="m"
                                                       type="arrowDown"
                                                     >
-                                                      <EuiIconEmpty
+                                                      <EuiIconBeaker
                                                         aria-hidden={true}
                                                         className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                         focusable="false"
@@ -311,8 +315,12 @@ exports[`Panels Table Component renders empty panel table container 1`] = `
                                                           viewBox="0 0 16 16"
                                                           width={16}
                                                           xmlns="http://www.w3.org/2000/svg"
-                                                        />
-                                                      </EuiIconEmpty>
+                                                        >
+                                                          <path
+                                                            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                          />
+                                                        </svg>
+                                                      </EuiIconBeaker>
                                                     </EuiIcon>
                                                     <span
                                                       className="euiButton__text"
diff --git a/public/components/custom_panels/__tests__/__snapshots__/custom_panel_view.test.tsx.snap b/public/components/custom_panels/__tests__/__snapshots__/custom_panel_view.test.tsx.snap
index eb407289ce..fcd77d38b7 100644
--- a/public/components/custom_panels/__tests__/__snapshots__/custom_panel_view.test.tsx.snap
+++ b/public/components/custom_panels/__tests__/__snapshots__/custom_panel_view.test.tsx.snap
@@ -2798,7 +2798,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                                           size="m"
                                           type="pencil"
                                         >
-                                          <EuiIconEmpty
+                                          <EuiIconBeaker
                                             aria-hidden={true}
                                             className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                             focusable="false"
@@ -2815,8 +2815,12 @@ exports[`Panels View Component renders panel view container without visualizatio
                                               viewBox="0 0 16 16"
                                               width={16}
                                               xmlns="http://www.w3.org/2000/svg"
-                                            />
-                                          </EuiIconEmpty>
+                                            >
+                                              <path
+                                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                              />
+                                            </svg>
+                                          </EuiIconBeaker>
                                         </EuiIcon>
                                         <span
                                           className="euiButton__text"
@@ -2913,7 +2917,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                                                 size="m"
                                                 type="arrowDown"
                                               >
-                                                <EuiIconEmpty
+                                                <EuiIconBeaker
                                                   aria-hidden={true}
                                                   className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                   focusable="false"
@@ -2930,8 +2934,12 @@ exports[`Panels View Component renders panel view container without visualizatio
                                                     viewBox="0 0 16 16"
                                                     width={16}
                                                     xmlns="http://www.w3.org/2000/svg"
-                                                  />
-                                                </EuiIconEmpty>
+                                                  >
+                                                    <path
+                                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                    />
+                                                  </svg>
+                                                </EuiIconBeaker>
                                               </EuiIcon>
                                               <span
                                                 className="euiButton__text"
@@ -3035,7 +3043,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                                                   size="m"
                                                   type="arrowDown"
                                                 >
-                                                  <EuiIconEmpty
+                                                  <EuiIconBeaker
                                                     aria-hidden={true}
                                                     className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                     focusable="false"
@@ -3052,8 +3060,12 @@ exports[`Panels View Component renders panel view container without visualizatio
                                                       viewBox="0 0 16 16"
                                                       width={16}
                                                       xmlns="http://www.w3.org/2000/svg"
-                                                    />
-                                                  </EuiIconEmpty>
+                                                    >
+                                                      <path
+                                                        d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                      />
+                                                    </svg>
+                                                  </EuiIconBeaker>
                                                 </EuiIcon>
                                                 <span
                                                   className="euiButton__text"
@@ -3549,7 +3561,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                                                           size="s"
                                                           type="arrowDown"
                                                         >
-                                                          <EuiIconEmpty
+                                                          <EuiIconBeaker
                                                             aria-hidden={true}
                                                             className="euiIcon euiIcon--small euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                             focusable="false"
@@ -3566,8 +3578,12 @@ exports[`Panels View Component renders panel view container without visualizatio
                                                               viewBox="0 0 16 16"
                                                               width={16}
                                                               xmlns="http://www.w3.org/2000/svg"
-                                                            />
-                                                          </EuiIconEmpty>
+                                                            >
+                                                              <path
+                                                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                              />
+                                                            </svg>
+                                                          </EuiIconBeaker>
                                                         </EuiIcon>
                                                         <span
                                                           className="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
@@ -3575,7 +3591,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                                                           <EuiIcon
                                                             type="calendar"
                                                           >
-                                                            <EuiIconEmpty
+                                                            <EuiIconBeaker
                                                               aria-hidden={true}
                                                               className="euiIcon euiIcon--medium euiIcon-isLoading"
                                                               focusable="false"
@@ -3592,8 +3608,12 @@ exports[`Panels View Component renders panel view container without visualizatio
                                                                 viewBox="0 0 16 16"
                                                                 width={16}
                                                                 xmlns="http://www.w3.org/2000/svg"
-                                                              />
-                                                            </EuiIconEmpty>
+                                                              >
+                                                                <path
+                                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                                />
+                                                              </svg>
+                                                            </EuiIconBeaker>
                                                           </EuiIcon>
                                                         </span>
                                                       </span>
@@ -3739,7 +3759,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                                                       size="m"
                                                       type="refresh"
                                                     >
-                                                      <EuiIconEmpty
+                                                      <EuiIconBeaker
                                                         aria-hidden={true}
                                                         className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                         focusable="false"
@@ -3756,8 +3776,12 @@ exports[`Panels View Component renders panel view container without visualizatio
                                                           viewBox="0 0 16 16"
                                                           width={16}
                                                           xmlns="http://www.w3.org/2000/svg"
-                                                        />
-                                                      </EuiIconEmpty>
+                                                        >
+                                                          <path
+                                                            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                          />
+                                                        </svg>
+                                                      </EuiIconBeaker>
                                                     </EuiIcon>
                                                     <span
                                                       className="euiButton__text euiSuperUpdateButton__text"
@@ -3952,7 +3976,7 @@ exports[`Panels View Component renders panel view container without visualizatio
                                                   size="m"
                                                   type="arrowDown"
                                                 >
-                                                  <EuiIconEmpty
+                                                  <EuiIconBeaker
                                                     aria-hidden={true}
                                                     className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                     focusable="false"
@@ -3969,8 +3993,12 @@ exports[`Panels View Component renders panel view container without visualizatio
                                                       viewBox="0 0 16 16"
                                                       width={16}
                                                       xmlns="http://www.w3.org/2000/svg"
-                                                    />
-                                                  </EuiIconEmpty>
+                                                    >
+                                                      <path
+                                                        d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                      />
+                                                    </svg>
+                                                  </EuiIconBeaker>
                                                 </EuiIcon>
                                                 <span
                                                   className="euiButton__text"
diff --git a/public/components/custom_panels/panel_modules/__tests__/__snapshots__/empty_panel.test.tsx.snap b/public/components/custom_panels/panel_modules/__tests__/__snapshots__/empty_panel.test.tsx.snap
index 0e74bd718b..9d405d37c0 100644
--- a/public/components/custom_panels/panel_modules/__tests__/__snapshots__/empty_panel.test.tsx.snap
+++ b/public/components/custom_panels/panel_modules/__tests__/__snapshots__/empty_panel.test.tsx.snap
@@ -160,7 +160,7 @@ exports[`Empty panel view component renders empty panel view with disabled popov
                                 size="m"
                                 type="arrowDown"
                               >
-                                <EuiIconEmpty
+                                <EuiIconBeaker
                                   aria-hidden={true}
                                   className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                   focusable="false"
@@ -177,8 +177,12 @@ exports[`Empty panel view component renders empty panel view with disabled popov
                                     viewBox="0 0 16 16"
                                     width={16}
                                     xmlns="http://www.w3.org/2000/svg"
-                                  />
-                                </EuiIconEmpty>
+                                  >
+                                    <path
+                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                    />
+                                  </svg>
+                                </EuiIconBeaker>
                               </EuiIcon>
                               <span
                                 className="euiButton__text"
diff --git a/public/components/custom_panels/panel_modules/visualization_container/__tests__/__snapshots__/visualization_container.test.tsx.snap b/public/components/custom_panels/panel_modules/visualization_container/__tests__/__snapshots__/visualization_container.test.tsx.snap
index 4fc2c8ef84..b855f47d64 100644
--- a/public/components/custom_panels/panel_modules/visualization_container/__tests__/__snapshots__/visualization_container.test.tsx.snap
+++ b/public/components/custom_panels/panel_modules/visualization_container/__tests__/__snapshots__/visualization_container.test.tsx.snap
@@ -106,7 +106,7 @@ exports[`Visualization Container Component renders add visualization container 1
                     onClick={[Function]}
                     type="crossInACircleFilled"
                   >
-                    <EuiIconEmpty
+                    <EuiIconBeaker
                       aria-hidden={true}
                       className="euiIcon euiIcon--medium euiIcon-isLoading"
                       data-test-subj="removeVisualizationButton"
@@ -127,8 +127,12 @@ exports[`Visualization Container Component renders add visualization container 1
                         viewBox="0 0 16 16"
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
-                      />
-                    </EuiIconEmpty>
+                      >
+                        <path
+                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                        />
+                      </svg>
+                    </EuiIconBeaker>
                   </EuiIcon>
                 </div>
               </EuiFlexItem>
diff --git a/public/components/custom_panels/panel_modules/visualization_flyout/__tests__/__snapshots__/visualization_flyout.test.tsx.snap b/public/components/custom_panels/panel_modules/visualization_flyout/__tests__/__snapshots__/visualization_flyout.test.tsx.snap
index 0e37e1e4a2..c20ca8ae6a 100644
--- a/public/components/custom_panels/panel_modules/visualization_flyout/__tests__/__snapshots__/visualization_flyout.test.tsx.snap
+++ b/public/components/custom_panels/panel_modules/visualization_flyout/__tests__/__snapshots__/visualization_flyout.test.tsx.snap
@@ -133,7 +133,11 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
-                      />
+                      >
+                        <path
+                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                        />
+                      </svg>
                     </button>
                     <div
                       class="euiFlyoutHeader euiFlyoutHeader--hasBorder"
@@ -345,7 +349,11 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                 viewBox="0 0 16 16"
                                 width="16"
                                 xmlns="http://www.w3.org/2000/svg"
-                              />
+                              >
+                                <path
+                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                />
+                              </svg>
                             </button>
                             <div
                               class="euiFlyoutHeader euiFlyoutHeader--hasBorder"
@@ -489,7 +497,11 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                   viewBox="0 0 16 16"
                                   width="16"
                                   xmlns="http://www.w3.org/2000/svg"
-                                />
+                                >
+                                  <path
+                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                  />
+                                </svg>
                               </button>
                               <div
                                 class="euiFlyoutHeader euiFlyoutHeader--hasBorder"
@@ -633,7 +645,11 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                     viewBox="0 0 16 16"
                                     width="16"
                                     xmlns="http://www.w3.org/2000/svg"
-                                  />
+                                  >
+                                    <path
+                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                    />
+                                  </svg>
                                 </button>
                                 <div
                                   class="euiFlyoutHeader euiFlyoutHeader--hasBorder"
@@ -765,7 +781,11 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                       viewBox="0 0 16 16"
                                       width="16"
                                       xmlns="http://www.w3.org/2000/svg"
-                                    />
+                                    >
+                                      <path
+                                        d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                      />
+                                    </svg>
                                   </button>
                                   <div
                                     class="euiFlyoutHeader euiFlyoutHeader--hasBorder"
@@ -933,7 +953,7 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                     size="m"
                                     type="cross"
                                   >
-                                    <EuiIconEmpty
+                                    <EuiIconBeaker
                                       aria-hidden={true}
                                       className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                       focusable="false"
@@ -950,8 +970,12 @@ exports[`Visualization Flyout Component renders add visualization Flyout 1`] = `
                                         viewBox="0 0 16 16"
                                         width={16}
                                         xmlns="http://www.w3.org/2000/svg"
-                                      />
-                                    </EuiIconEmpty>
+                                      >
+                                        <path
+                                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                        />
+                                      </svg>
+                                    </EuiIconBeaker>
                                   </EuiIcon>
                                 </button>
                               </EuiButtonIcon>
diff --git a/public/components/datasources/components/__tests__/__snapshots__/connection_details.test.tsx.snap b/public/components/datasources/components/__tests__/__snapshots__/connection_details.test.tsx.snap
index 6fb23b7abb..5b35615a54 100644
--- a/public/components/datasources/components/__tests__/__snapshots__/connection_details.test.tsx.snap
+++ b/public/components/datasources/components/__tests__/__snapshots__/connection_details.test.tsx.snap
@@ -298,7 +298,7 @@ exports[`Connection Details test Renders connection details for s3 datasource 1`
             size="m"
             type="iInCircle"
           >
-            <EuiIconEmpty
+            <EuiIconBeaker
               aria-hidden={true}
               className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiCallOutHeader__icon"
               focusable="false"
@@ -315,8 +315,12 @@ exports[`Connection Details test Renders connection details for s3 datasource 1`
                 viewBox="0 0 16 16"
                 width={16}
                 xmlns="http://www.w3.org/2000/svg"
-              />
-            </EuiIconEmpty>
+              >
+                <path
+                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                />
+              </svg>
+            </EuiIconBeaker>
           </EuiIcon>
           <span
             className="euiCallOutHeader__title"
diff --git a/public/components/datasources/components/__tests__/__snapshots__/data_connection.test.tsx.snap b/public/components/datasources/components/__tests__/__snapshots__/data_connection.test.tsx.snap
index 1b0f81471a..b3207d5309 100644
--- a/public/components/datasources/components/__tests__/__snapshots__/data_connection.test.tsx.snap
+++ b/public/components/datasources/components/__tests__/__snapshots__/data_connection.test.tsx.snap
@@ -127,7 +127,11 @@ exports[`Data Connection Page test Renders Prometheus data connection page with
                 viewBox="0 0 16 16"
                 width="16"
                 xmlns="http://www.w3.org/2000/svg"
-              />
+              >
+                <path
+                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                />
+              </svg>
             </span>
             <span
               class="euiIEFlexWrapFix"
@@ -168,7 +172,11 @@ exports[`Data Connection Page test Renders Prometheus data connection page with
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
-                      />
+                      >
+                        <path
+                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                        />
+                      </svg>
                     </div>
                     <div
                       class="euiCard__content"
@@ -257,7 +265,11 @@ exports[`Data Connection Page test Renders Prometheus data connection page with
                 viewBox="0 0 16 16"
                 width="16"
                 xmlns="http://www.w3.org/2000/svg"
-              />
+              >
+                <path
+                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                />
+              </svg>
               <span
                 class="euiCallOutHeader__title"
               >
@@ -603,7 +615,11 @@ exports[`Data Connection Page test Renders S3 data connection page with data 1`]
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
-                      />
+                      >
+                        <path
+                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                        />
+                      </svg>
                     </div>
                     <div
                       class="euiCard__content"
@@ -648,7 +664,11 @@ exports[`Data Connection Page test Renders S3 data connection page with data 1`]
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
-                      />
+                      >
+                        <path
+                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                        />
+                      </svg>
                     </div>
                     <div
                       class="euiCard__content"
@@ -693,7 +713,11 @@ exports[`Data Connection Page test Renders S3 data connection page with data 1`]
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
-                      />
+                      >
+                        <path
+                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                        />
+                      </svg>
                     </div>
                     <div
                       class="euiCard__content"
diff --git a/public/components/datasources/components/__tests__/__snapshots__/manage_data_connections_description.test.tsx.snap b/public/components/datasources/components/__tests__/__snapshots__/manage_data_connections_description.test.tsx.snap
index b0af24ae49..31368b5ba7 100644
--- a/public/components/datasources/components/__tests__/__snapshots__/manage_data_connections_description.test.tsx.snap
+++ b/public/components/datasources/components/__tests__/__snapshots__/manage_data_connections_description.test.tsx.snap
@@ -115,7 +115,7 @@ exports[`Manage Data Connections Description test Renders manage data connection
                         size="m"
                         type="refresh"
                       >
-                        <EuiIconEmpty
+                        <EuiIconBeaker
                           aria-hidden={true}
                           className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                           focusable="false"
@@ -132,8 +132,12 @@ exports[`Manage Data Connections Description test Renders manage data connection
                             viewBox="0 0 16 16"
                             width={16}
                             xmlns="http://www.w3.org/2000/svg"
-                          />
-                        </EuiIconEmpty>
+                          >
+                            <path
+                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                            />
+                          </svg>
+                        </EuiIconBeaker>
                       </EuiIcon>
                       <span
                         className="euiButton__text"
diff --git a/public/components/datasources/components/__tests__/__snapshots__/manage_data_connections_table.test.tsx.snap b/public/components/datasources/components/__tests__/__snapshots__/manage_data_connections_table.test.tsx.snap
index b1450c9e48..6736138755 100644
--- a/public/components/datasources/components/__tests__/__snapshots__/manage_data_connections_table.test.tsx.snap
+++ b/public/components/datasources/components/__tests__/__snapshots__/manage_data_connections_table.test.tsx.snap
@@ -51,7 +51,11 @@ exports[`Manage Data Connections Table test Renders manage data connections tabl
                 viewBox="0 0 16 16"
                 width="16"
                 xmlns="http://www.w3.org/2000/svg"
-              />
+              >
+                <path
+                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                />
+              </svg>
             </a>
           </div>
         </div>
@@ -150,7 +154,11 @@ exports[`Manage Data Connections Table test Renders manage data connections tabl
                     viewBox="0 0 16 16"
                     width="16"
                     xmlns="http://www.w3.org/2000/svg"
-                  />
+                  >
+                    <path
+                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                    />
+                  </svg>
                   <span
                     class="euiButton__text"
                   >
@@ -199,7 +207,11 @@ exports[`Manage Data Connections Table test Renders manage data connections tabl
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
-                      />
+                      >
+                        <path
+                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                        />
+                      </svg>
                     </span>
                   </div>
                 </div>
@@ -329,7 +341,11 @@ exports[`Manage Data Connections Table test Renders manage data connections tabl
                             viewBox="0 0 16 16"
                             width="16"
                             xmlns="http://www.w3.org/2000/svg"
-                          />
+                          >
+                            <path
+                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                            />
+                          </svg>
                         </button>
                         <span
                           class="euiScreenReaderOnly"
@@ -352,7 +368,11 @@ exports[`Manage Data Connections Table test Renders manage data connections tabl
                             viewBox="0 0 16 16"
                             width="16"
                             xmlns="http://www.w3.org/2000/svg"
-                          />
+                          >
+                            <path
+                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                            />
+                          </svg>
                         </button>
                         <span
                           class="euiScreenReaderOnly"
@@ -388,7 +408,11 @@ exports[`Manage Data Connections Table test Renders manage data connections tabl
                                     viewBox="0 0 16 16"
                                     width="16"
                                     xmlns="http://www.w3.org/2000/svg"
-                                  />
+                                  >
+                                    <path
+                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                    />
+                                  </svg>
                                 </button>
                               </span>
                             </div>
@@ -453,7 +477,11 @@ exports[`Manage Data Connections Table test Renders manage data connections tabl
                             viewBox="0 0 16 16"
                             width="16"
                             xmlns="http://www.w3.org/2000/svg"
-                          />
+                          >
+                            <path
+                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                            />
+                          </svg>
                         </button>
                         <span
                           class="euiScreenReaderOnly"
@@ -476,7 +504,11 @@ exports[`Manage Data Connections Table test Renders manage data connections tabl
                             viewBox="0 0 16 16"
                             width="16"
                             xmlns="http://www.w3.org/2000/svg"
-                          />
+                          >
+                            <path
+                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                            />
+                          </svg>
                         </button>
                         <span
                           class="euiScreenReaderOnly"
@@ -512,7 +544,11 @@ exports[`Manage Data Connections Table test Renders manage data connections tabl
                                     viewBox="0 0 16 16"
                                     width="16"
                                     xmlns="http://www.w3.org/2000/svg"
-                                  />
+                                  >
+                                    <path
+                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                    />
+                                  </svg>
                                 </button>
                               </span>
                             </div>
@@ -577,7 +613,11 @@ exports[`Manage Data Connections Table test Renders manage data connections tabl
                             viewBox="0 0 16 16"
                             width="16"
                             xmlns="http://www.w3.org/2000/svg"
-                          />
+                          >
+                            <path
+                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                            />
+                          </svg>
                         </button>
                         <span
                           class="euiScreenReaderOnly"
@@ -600,7 +640,11 @@ exports[`Manage Data Connections Table test Renders manage data connections tabl
                             viewBox="0 0 16 16"
                             width="16"
                             xmlns="http://www.w3.org/2000/svg"
-                          />
+                          >
+                            <path
+                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                            />
+                          </svg>
                         </button>
                         <span
                           class="euiScreenReaderOnly"
@@ -636,7 +680,11 @@ exports[`Manage Data Connections Table test Renders manage data connections tabl
                                     viewBox="0 0 16 16"
                                     width="16"
                                     xmlns="http://www.w3.org/2000/svg"
-                                  />
+                                  >
+                                    <path
+                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                    />
+                                  </svg>
                                 </button>
                               </span>
                             </div>
@@ -701,7 +749,11 @@ exports[`Manage Data Connections Table test Renders manage data connections tabl
                             viewBox="0 0 16 16"
                             width="16"
                             xmlns="http://www.w3.org/2000/svg"
-                          />
+                          >
+                            <path
+                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                            />
+                          </svg>
                         </button>
                         <span
                           class="euiScreenReaderOnly"
@@ -724,7 +776,11 @@ exports[`Manage Data Connections Table test Renders manage data connections tabl
                             viewBox="0 0 16 16"
                             width="16"
                             xmlns="http://www.w3.org/2000/svg"
-                          />
+                          >
+                            <path
+                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                            />
+                          </svg>
                         </button>
                         <span
                           class="euiScreenReaderOnly"
@@ -760,7 +816,11 @@ exports[`Manage Data Connections Table test Renders manage data connections tabl
                                     viewBox="0 0 16 16"
                                     width="16"
                                     xmlns="http://www.w3.org/2000/svg"
-                                  />
+                                  >
+                                    <path
+                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                    />
+                                  </svg>
                                 </button>
                               </span>
                             </div>
@@ -805,7 +865,11 @@ exports[`Manage Data Connections Table test Renders manage data connections tabl
                             viewBox="0 0 16 16"
                             width="16"
                             xmlns="http://www.w3.org/2000/svg"
-                          />
+                          >
+                            <path
+                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                            />
+                          </svg>
                           <span
                             class="euiButtonEmpty__text"
                           >
@@ -840,7 +904,11 @@ exports[`Manage Data Connections Table test Renders manage data connections tabl
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
-                      />
+                      >
+                        <path
+                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                        />
+                      </svg>
                     </button>
                     <ul
                       class="euiPagination__list"
@@ -885,7 +953,11 @@ exports[`Manage Data Connections Table test Renders manage data connections tabl
                         viewBox="0 0 16 16"
                         width="16"
                         xmlns="http://www.w3.org/2000/svg"
-                      />
+                      >
+                        <path
+                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                        />
+                      </svg>
                     </button>
                   </nav>
                 </div>
diff --git a/public/components/datasources/components/__tests__/__snapshots__/no_access.test.tsx.snap b/public/components/datasources/components/__tests__/__snapshots__/no_access.test.tsx.snap
index a4b27f4544..5fd77b87ba 100644
--- a/public/components/datasources/components/__tests__/__snapshots__/no_access.test.tsx.snap
+++ b/public/components/datasources/components/__tests__/__snapshots__/no_access.test.tsx.snap
@@ -36,7 +36,7 @@ exports[`No access test Renders no access view of data source 1`] = `
             size="xxl"
             type="alert"
           >
-            <EuiIconEmpty
+            <EuiIconBeaker
               aria-hidden={true}
               className="euiIcon euiIcon--xxLarge euiIcon--subdued euiIcon-isLoading"
               focusable="false"
@@ -53,8 +53,12 @@ exports[`No access test Renders no access view of data source 1`] = `
                 viewBox="0 0 16 16"
                 width={16}
                 xmlns="http://www.w3.org/2000/svg"
-              />
-            </EuiIconEmpty>
+              >
+                <path
+                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                />
+              </svg>
+            </EuiIconBeaker>
           </EuiIcon>
           <EuiSpacer
             size="m"
diff --git a/public/components/integrations/components/__tests__/__snapshots__/added_integration.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/added_integration.test.tsx.snap
index 7ef7eb7859..4f499e10ed 100644
--- a/public/components/integrations/components/__tests__/__snapshots__/added_integration.test.tsx.snap
+++ b/public/components/integrations/components/__tests__/__snapshots__/added_integration.test.tsx.snap
@@ -176,7 +176,7 @@ exports[`Added Integration View Test Renders added integration view using dummy
                                                 color="danger"
                                                 type="dot"
                                               >
-                                                <EuiIconEmpty
+                                                <EuiIconBeaker
                                                   aria-hidden={true}
                                                   className="euiIcon euiIcon--medium euiIcon--danger euiIcon-isLoading"
                                                   focusable="false"
@@ -193,8 +193,12 @@ exports[`Added Integration View Test Renders added integration view using dummy
                                                     viewBox="0 0 16 16"
                                                     width={16}
                                                     xmlns="http://www.w3.org/2000/svg"
-                                                  />
-                                                </EuiIconEmpty>
+                                                  >
+                                                    <path
+                                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                    />
+                                                  </svg>
+                                                </EuiIconBeaker>
                                               </EuiIcon>
                                             </div>
                                           </EuiFlexItem>
@@ -243,7 +247,7 @@ exports[`Added Integration View Test Renders added integration view using dummy
                                     size="m"
                                     type="trash"
                                   >
-                                    <EuiIconEmpty
+                                    <EuiIconBeaker
                                       aria-hidden={true}
                                       className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                       focusable="false"
@@ -260,8 +264,12 @@ exports[`Added Integration View Test Renders added integration view using dummy
                                         viewBox="0 0 16 16"
                                         width={16}
                                         xmlns="http://www.w3.org/2000/svg"
-                                      />
-                                    </EuiIconEmpty>
+                                      >
+                                        <path
+                                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                        />
+                                      </svg>
+                                    </EuiIconBeaker>
                                   </EuiIcon>
                                 </button>
                               </EuiButtonIcon>
@@ -572,7 +580,7 @@ exports[`Added Integration View Test Renders added integration view using dummy
                                                 size="m"
                                                 type="search"
                                               >
-                                                <EuiIconEmpty
+                                                <EuiIconBeaker
                                                   aria-hidden={true}
                                                   className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                                   focusable="false"
@@ -589,8 +597,12 @@ exports[`Added Integration View Test Renders added integration view using dummy
                                                     viewBox="0 0 16 16"
                                                     width={16}
                                                     xmlns="http://www.w3.org/2000/svg"
-                                                  />
-                                                </EuiIconEmpty>
+                                                  >
+                                                    <path
+                                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                    />
+                                                  </svg>
+                                                </EuiIconBeaker>
                                               </EuiIcon>
                                             </span>
                                           </EuiFormControlLayoutCustomIcon>
@@ -796,7 +808,7 @@ exports[`Added Integration View Test Renders added integration view using dummy
                                                       size="m"
                                                       type="arrowDown"
                                                     >
-                                                      <EuiIconEmpty
+                                                      <EuiIconBeaker
                                                         aria-hidden={true}
                                                         className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                         focusable="false"
@@ -813,8 +825,12 @@ exports[`Added Integration View Test Renders added integration view using dummy
                                                           viewBox="0 0 16 16"
                                                           width={16}
                                                           xmlns="http://www.w3.org/2000/svg"
-                                                        />
-                                                      </EuiIconEmpty>
+                                                        >
+                                                          <path
+                                                            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                          />
+                                                        </svg>
+                                                      </EuiIconBeaker>
                                                     </EuiIcon>
                                                     <span
                                                       className="euiButtonEmpty__text"
diff --git a/public/components/integrations/components/__tests__/__snapshots__/added_integration_flyout.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/added_integration_flyout.test.tsx.snap
index 3ba54c92b4..c08ba9003e 100644
--- a/public/components/integrations/components/__tests__/__snapshots__/added_integration_flyout.test.tsx.snap
+++ b/public/components/integrations/components/__tests__/__snapshots__/added_integration_flyout.test.tsx.snap
@@ -62,7 +62,11 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                     viewBox="0 0 16 16"
                     width="16"
                     xmlns="http://www.w3.org/2000/svg"
-                  />
+                  >
+                    <path
+                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                    />
+                  </svg>
                 </button>
                 <div
                   class="euiFlyoutHeader euiFlyoutHeader--hasBorder"
@@ -123,7 +127,11 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                     viewBox="0 0 16 16"
                                     width="16"
                                     xmlns="http://www.w3.org/2000/svg"
-                                  />
+                                  >
+                                    <path
+                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                    />
+                                  </svg>
                                   <span
                                     class="euiScreenReaderOnly"
                                   >
@@ -389,7 +397,11 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                             viewBox="0 0 16 16"
                             width="16"
                             xmlns="http://www.w3.org/2000/svg"
-                          />
+                          >
+                            <path
+                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                            />
+                          </svg>
                         </button>
                         <div
                           class="euiFlyoutHeader euiFlyoutHeader--hasBorder"
@@ -450,7 +462,11 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                             viewBox="0 0 16 16"
                                             width="16"
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
                                           <span
                                             class="euiScreenReaderOnly"
                                           >
@@ -648,7 +664,11 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                               viewBox="0 0 16 16"
                               width="16"
                               xmlns="http://www.w3.org/2000/svg"
-                            />
+                            >
+                              <path
+                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                              />
+                            </svg>
                           </button>
                           <div
                             class="euiFlyoutHeader euiFlyoutHeader--hasBorder"
@@ -709,7 +729,11 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                               viewBox="0 0 16 16"
                                               width="16"
                                               xmlns="http://www.w3.org/2000/svg"
-                                            />
+                                            >
+                                              <path
+                                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                              />
+                                            </svg>
                                             <span
                                               class="euiScreenReaderOnly"
                                             >
@@ -907,7 +931,11 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                 viewBox="0 0 16 16"
                                 width="16"
                                 xmlns="http://www.w3.org/2000/svg"
-                              />
+                              >
+                                <path
+                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                />
+                              </svg>
                             </button>
                             <div
                               class="euiFlyoutHeader euiFlyoutHeader--hasBorder"
@@ -968,7 +996,11 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                                 viewBox="0 0 16 16"
                                                 width="16"
                                                 xmlns="http://www.w3.org/2000/svg"
-                                              />
+                                              >
+                                                <path
+                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                />
+                                              </svg>
                                               <span
                                                 class="euiScreenReaderOnly"
                                               >
@@ -1154,7 +1186,11 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                   viewBox="0 0 16 16"
                                   width="16"
                                   xmlns="http://www.w3.org/2000/svg"
-                                />
+                                >
+                                  <path
+                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                  />
+                                </svg>
                               </button>
                               <div
                                 class="euiFlyoutHeader euiFlyoutHeader--hasBorder"
@@ -1215,7 +1251,11 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                                   viewBox="0 0 16 16"
                                                   width="16"
                                                   xmlns="http://www.w3.org/2000/svg"
-                                                />
+                                                >
+                                                  <path
+                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                  />
+                                                </svg>
                                                 <span
                                                   class="euiScreenReaderOnly"
                                                 >
@@ -1437,7 +1477,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                 size="m"
                                 type="cross"
                               >
-                                <EuiIconEmpty
+                                <EuiIconBeaker
                                   aria-hidden={true}
                                   className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                   focusable="false"
@@ -1454,8 +1494,12 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                     viewBox="0 0 16 16"
                                     width={16}
                                     xmlns="http://www.w3.org/2000/svg"
-                                  />
-                                </EuiIconEmpty>
+                                  >
+                                    <path
+                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                    />
+                                  </svg>
+                                </EuiIconBeaker>
                               </EuiIcon>
                             </button>
                           </EuiButtonIcon>
@@ -1569,7 +1613,7 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                                       size="s"
                                                       type="popout"
                                                     >
-                                                      <EuiIconEmpty
+                                                      <EuiIconBeaker
                                                         aria-hidden={true}
                                                         aria-label="External link"
                                                         className="euiIcon euiIcon--small euiIcon-isLoading euiLink__externalIcon"
@@ -1588,8 +1632,12 @@ exports[`Add Integration Flyout Test Renders add integration flyout with dummy i
                                                           viewBox="0 0 16 16"
                                                           width={16}
                                                           xmlns="http://www.w3.org/2000/svg"
-                                                        />
-                                                      </EuiIconEmpty>
+                                                        >
+                                                          <path
+                                                            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                          />
+                                                        </svg>
+                                                      </EuiIconBeaker>
                                                     </EuiIcon>
                                                     <EuiScreenReaderOnly>
                                                       <span
diff --git a/public/components/integrations/components/__tests__/__snapshots__/added_integration_table.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/added_integration_table.test.tsx.snap
index 64c7d9e036..0e3c8c9c33 100644
--- a/public/components/integrations/components/__tests__/__snapshots__/added_integration_table.test.tsx.snap
+++ b/public/components/integrations/components/__tests__/__snapshots__/added_integration_table.test.tsx.snap
@@ -293,7 +293,7 @@ exports[`Added Integration Table View Test Renders added integration table view
                                           size="m"
                                           type="search"
                                         >
-                                          <EuiIconEmpty
+                                          <EuiIconBeaker
                                             aria-hidden={true}
                                             className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                             focusable="false"
@@ -310,8 +310,12 @@ exports[`Added Integration Table View Test Renders added integration table view
                                               viewBox="0 0 16 16"
                                               width={16}
                                               xmlns="http://www.w3.org/2000/svg"
-                                            />
-                                          </EuiIconEmpty>
+                                            >
+                                              <path
+                                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                              />
+                                            </svg>
+                                          </EuiIconBeaker>
                                         </EuiIcon>
                                       </span>
                                     </EuiFormControlLayoutCustomIcon>
@@ -487,7 +491,7 @@ exports[`Added Integration Table View Test Renders added integration table view
                                                 size="m"
                                                 type="arrowDown"
                                               >
-                                                <EuiIconEmpty
+                                                <EuiIconBeaker
                                                   aria-hidden={true}
                                                   className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                   focusable="false"
@@ -504,8 +508,12 @@ exports[`Added Integration Table View Test Renders added integration table view
                                                     viewBox="0 0 16 16"
                                                     width={16}
                                                     xmlns="http://www.w3.org/2000/svg"
-                                                  />
-                                                </EuiIconEmpty>
+                                                  >
+                                                    <path
+                                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                    />
+                                                  </svg>
+                                                </EuiIconBeaker>
                                               </EuiIcon>
                                               <span
                                                 className="euiButtonEmpty__text"
@@ -1037,7 +1045,7 @@ exports[`Added Integration Table View Test Renders added integration table view
                                       onClick={[Function]}
                                       type="trash"
                                     >
-                                      <EuiIconEmpty
+                                      <EuiIconBeaker
                                         aria-hidden={true}
                                         className="euiIcon euiIcon--medium euiIcon-isLoading"
                                         focusable="false"
@@ -1056,8 +1064,12 @@ exports[`Added Integration Table View Test Renders added integration table view
                                           viewBox="0 0 16 16"
                                           width={16}
                                           xmlns="http://www.w3.org/2000/svg"
-                                        />
-                                      </EuiIconEmpty>
+                                        >
+                                          <path
+                                            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                          />
+                                        </svg>
+                                      </EuiIconBeaker>
                                     </EuiIcon>
                                   </div>
                                 </td>
@@ -1191,7 +1203,7 @@ exports[`Added Integration Table View Test Renders added integration table view
                                               size="s"
                                               type="arrowDown"
                                             >
-                                              <EuiIconEmpty
+                                              <EuiIconBeaker
                                                 aria-hidden={true}
                                                 className="euiIcon euiIcon--small euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                 focusable="false"
@@ -1208,8 +1220,12 @@ exports[`Added Integration Table View Test Renders added integration table view
                                                   viewBox="0 0 16 16"
                                                   width={16}
                                                   xmlns="http://www.w3.org/2000/svg"
-                                                />
-                                              </EuiIconEmpty>
+                                                >
+                                                  <path
+                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                  />
+                                                </svg>
+                                              </EuiIconBeaker>
                                             </EuiIcon>
                                             <span
                                               className="euiButtonEmpty__text"
@@ -1283,7 +1299,7 @@ exports[`Added Integration Table View Test Renders added integration table view
                                             size="m"
                                             type="arrowLeft"
                                           >
-                                            <EuiIconEmpty
+                                            <EuiIconBeaker
                                               aria-hidden={true}
                                               className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                               focusable="false"
@@ -1300,8 +1316,12 @@ exports[`Added Integration Table View Test Renders added integration table view
                                                 viewBox="0 0 16 16"
                                                 width={16}
                                                 xmlns="http://www.w3.org/2000/svg"
-                                              />
-                                            </EuiIconEmpty>
+                                              >
+                                                <path
+                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                />
+                                              </svg>
+                                            </EuiIconBeaker>
                                           </EuiIcon>
                                         </button>
                                       </EuiButtonIcon>
@@ -1430,7 +1450,7 @@ exports[`Added Integration Table View Test Renders added integration table view
                                             size="m"
                                             type="arrowRight"
                                           >
-                                            <EuiIconEmpty
+                                            <EuiIconBeaker
                                               aria-hidden={true}
                                               className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                               focusable="false"
@@ -1447,8 +1467,12 @@ exports[`Added Integration Table View Test Renders added integration table view
                                                 viewBox="0 0 16 16"
                                                 width={16}
                                                 xmlns="http://www.w3.org/2000/svg"
-                                              />
-                                            </EuiIconEmpty>
+                                              >
+                                                <path
+                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                />
+                                              </svg>
+                                            </EuiIconBeaker>
                                           </EuiIcon>
                                         </button>
                                       </EuiButtonIcon>
diff --git a/public/components/integrations/components/__tests__/__snapshots__/available_integration_card_view.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/available_integration_card_view.test.tsx.snap
index 9f6372b915..6f47d925a0 100644
--- a/public/components/integrations/components/__tests__/__snapshots__/available_integration_card_view.test.tsx.snap
+++ b/public/components/integrations/components/__tests__/__snapshots__/available_integration_card_view.test.tsx.snap
@@ -125,7 +125,7 @@ exports[`Available Integration Card View Test Renders nginx integration card vie
                                 size="m"
                                 type="search"
                               >
-                                <EuiIconEmpty
+                                <EuiIconBeaker
                                   aria-hidden={true}
                                   className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                   focusable="false"
@@ -142,8 +142,12 @@ exports[`Available Integration Card View Test Renders nginx integration card vie
                                     viewBox="0 0 16 16"
                                     width={16}
                                     xmlns="http://www.w3.org/2000/svg"
-                                  />
-                                </EuiIconEmpty>
+                                  >
+                                    <path
+                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                    />
+                                  </svg>
+                                </EuiIconBeaker>
                               </EuiIcon>
                             </span>
                           </EuiFormControlLayoutCustomIcon>
@@ -269,7 +273,7 @@ exports[`Available Integration Card View Test Renders nginx integration card vie
                                 size="m"
                                 type="list"
                               >
-                                <EuiIconEmpty
+                                <EuiIconBeaker
                                   aria-hidden={true}
                                   className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                   focusable="false"
@@ -286,8 +290,12 @@ exports[`Available Integration Card View Test Renders nginx integration card vie
                                     viewBox="0 0 16 16"
                                     width={16}
                                     xmlns="http://www.w3.org/2000/svg"
-                                  />
-                                </EuiIconEmpty>
+                                  >
+                                    <path
+                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                    />
+                                  </svg>
+                                </EuiIconBeaker>
                               </EuiIcon>
                               <span
                                 className="euiButton__text euiScreenReaderOnly"
@@ -378,7 +386,7 @@ exports[`Available Integration Card View Test Renders nginx integration card vie
                                 size="m"
                                 type="grid"
                               >
-                                <EuiIconEmpty
+                                <EuiIconBeaker
                                   aria-hidden={true}
                                   className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                   focusable="false"
@@ -395,8 +403,12 @@ exports[`Available Integration Card View Test Renders nginx integration card vie
                                     viewBox="0 0 16 16"
                                     width={16}
                                     xmlns="http://www.w3.org/2000/svg"
-                                  />
-                                </EuiIconEmpty>
+                                  >
+                                    <path
+                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                    />
+                                  </svg>
+                                </EuiIconBeaker>
                               </EuiIcon>
                               <span
                                 className="euiButton__text euiScreenReaderOnly"
diff --git a/public/components/integrations/components/__tests__/__snapshots__/available_integration_table_view.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/available_integration_table_view.test.tsx.snap
index e1cb6a440f..5852280617 100644
--- a/public/components/integrations/components/__tests__/__snapshots__/available_integration_table_view.test.tsx.snap
+++ b/public/components/integrations/components/__tests__/__snapshots__/available_integration_table_view.test.tsx.snap
@@ -320,7 +320,7 @@ exports[`Available Integration Table View Test Renders nginx integration table v
                                           size="m"
                                           type="search"
                                         >
-                                          <EuiIconEmpty
+                                          <EuiIconBeaker
                                             aria-hidden={true}
                                             className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                             focusable="false"
@@ -337,8 +337,12 @@ exports[`Available Integration Table View Test Renders nginx integration table v
                                               viewBox="0 0 16 16"
                                               width={16}
                                               xmlns="http://www.w3.org/2000/svg"
-                                            />
-                                          </EuiIconEmpty>
+                                            >
+                                              <path
+                                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                              />
+                                            </svg>
+                                          </EuiIconBeaker>
                                         </EuiIcon>
                                       </span>
                                     </EuiFormControlLayoutCustomIcon>
@@ -471,7 +475,7 @@ exports[`Available Integration Table View Test Renders nginx integration table v
                                                 size="m"
                                                 type="list"
                                               >
-                                                <EuiIconEmpty
+                                                <EuiIconBeaker
                                                   aria-hidden={true}
                                                   className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                   focusable="false"
@@ -488,8 +492,12 @@ exports[`Available Integration Table View Test Renders nginx integration table v
                                                     viewBox="0 0 16 16"
                                                     width={16}
                                                     xmlns="http://www.w3.org/2000/svg"
-                                                  />
-                                                </EuiIconEmpty>
+                                                  >
+                                                    <path
+                                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                    />
+                                                  </svg>
+                                                </EuiIconBeaker>
                                               </EuiIcon>
                                               <span
                                                 className="euiButton__text euiScreenReaderOnly"
@@ -580,7 +588,7 @@ exports[`Available Integration Table View Test Renders nginx integration table v
                                                 size="m"
                                                 type="grid"
                                               >
-                                                <EuiIconEmpty
+                                                <EuiIconBeaker
                                                   aria-hidden={true}
                                                   className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                   focusable="false"
@@ -597,8 +605,12 @@ exports[`Available Integration Table View Test Renders nginx integration table v
                                                     viewBox="0 0 16 16"
                                                     width={16}
                                                     xmlns="http://www.w3.org/2000/svg"
-                                                  />
-                                                </EuiIconEmpty>
+                                                  >
+                                                    <path
+                                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                    />
+                                                  </svg>
+                                                </EuiIconBeaker>
                                               </EuiIcon>
                                               <span
                                                 className="euiButton__text euiScreenReaderOnly"
@@ -1207,7 +1219,7 @@ exports[`Available Integration Table View Test Renders nginx integration table v
                                               size="s"
                                               type="arrowDown"
                                             >
-                                              <EuiIconEmpty
+                                              <EuiIconBeaker
                                                 aria-hidden={true}
                                                 className="euiIcon euiIcon--small euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                 focusable="false"
@@ -1224,8 +1236,12 @@ exports[`Available Integration Table View Test Renders nginx integration table v
                                                   viewBox="0 0 16 16"
                                                   width={16}
                                                   xmlns="http://www.w3.org/2000/svg"
-                                                />
-                                              </EuiIconEmpty>
+                                                >
+                                                  <path
+                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                  />
+                                                </svg>
+                                              </EuiIconBeaker>
                                             </EuiIcon>
                                             <span
                                               className="euiButtonEmpty__text"
@@ -1299,7 +1315,7 @@ exports[`Available Integration Table View Test Renders nginx integration table v
                                             size="m"
                                             type="arrowLeft"
                                           >
-                                            <EuiIconEmpty
+                                            <EuiIconBeaker
                                               aria-hidden={true}
                                               className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                               focusable="false"
@@ -1316,8 +1332,12 @@ exports[`Available Integration Table View Test Renders nginx integration table v
                                                 viewBox="0 0 16 16"
                                                 width={16}
                                                 xmlns="http://www.w3.org/2000/svg"
-                                              />
-                                            </EuiIconEmpty>
+                                              >
+                                                <path
+                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                />
+                                              </svg>
+                                            </EuiIconBeaker>
                                           </EuiIcon>
                                         </button>
                                       </EuiButtonIcon>
@@ -1446,7 +1466,7 @@ exports[`Available Integration Table View Test Renders nginx integration table v
                                             size="m"
                                             type="arrowRight"
                                           >
-                                            <EuiIconEmpty
+                                            <EuiIconBeaker
                                               aria-hidden={true}
                                               className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                               focusable="false"
@@ -1463,8 +1483,12 @@ exports[`Available Integration Table View Test Renders nginx integration table v
                                                 viewBox="0 0 16 16"
                                                 width={16}
                                                 xmlns="http://www.w3.org/2000/svg"
-                                              />
-                                            </EuiIconEmpty>
+                                              >
+                                                <path
+                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                />
+                                              </svg>
+                                            </EuiIconBeaker>
                                           </EuiIcon>
                                         </button>
                                       </EuiButtonIcon>
diff --git a/public/components/integrations/components/__tests__/__snapshots__/integration_details.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/integration_details.test.tsx.snap
index 5274b335b7..18d1867951 100644
--- a/public/components/integrations/components/__tests__/__snapshots__/integration_details.test.tsx.snap
+++ b/public/components/integrations/components/__tests__/__snapshots__/integration_details.test.tsx.snap
@@ -120,7 +120,7 @@ exports[`Available Integration Table View Test Renders nginx integration table v
                   size="s"
                   type="popout"
                 >
-                  <EuiIconEmpty
+                  <EuiIconBeaker
                     aria-hidden={true}
                     aria-label="External link"
                     className="euiIcon euiIcon--small euiIcon-isLoading euiLink__externalIcon"
@@ -139,8 +139,12 @@ exports[`Available Integration Table View Test Renders nginx integration table v
                       viewBox="0 0 16 16"
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
-                    />
-                  </EuiIconEmpty>
+                    >
+                      <path
+                        d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                      />
+                    </svg>
+                  </EuiIconBeaker>
                 </EuiIcon>
               </a>
             </EuiLink>
diff --git a/public/components/integrations/components/__tests__/__snapshots__/integration_fields.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/integration_fields.test.tsx.snap
index 77fb9d7a07..9617512f0f 100644
--- a/public/components/integrations/components/__tests__/__snapshots__/integration_fields.test.tsx.snap
+++ b/public/components/integrations/components/__tests__/__snapshots__/integration_fields.test.tsx.snap
@@ -160,7 +160,7 @@ exports[`Available Integration Table View Test Renders nginx integration table v
                                       size="m"
                                       type="search"
                                     >
-                                      <EuiIconEmpty
+                                      <EuiIconBeaker
                                         aria-hidden={true}
                                         className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
@@ -177,8 +177,12 @@ exports[`Available Integration Table View Test Renders nginx integration table v
                                           viewBox="0 0 16 16"
                                           width={16}
                                           xmlns="http://www.w3.org/2000/svg"
-                                        />
-                                      </EuiIconEmpty>
+                                        >
+                                          <path
+                                            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                          />
+                                        </svg>
+                                      </EuiIconBeaker>
                                     </EuiIcon>
                                   </span>
                                 </EuiFormControlLayoutCustomIcon>
diff --git a/public/components/integrations/components/__tests__/__snapshots__/integration_header.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/integration_header.test.tsx.snap
index 9aa43c4964..41591c2408 100644
--- a/public/components/integrations/components/__tests__/__snapshots__/integration_header.test.tsx.snap
+++ b/public/components/integrations/components/__tests__/__snapshots__/integration_header.test.tsx.snap
@@ -67,7 +67,7 @@ exports[`Integration Header Test Renders integration header as expected 1`] = `
                   size="s"
                   type="popout"
                 >
-                  <EuiIconEmpty
+                  <EuiIconBeaker
                     aria-hidden={true}
                     aria-label="External link"
                     className="euiIcon euiIcon--small euiIcon-isLoading euiLink__externalIcon"
@@ -86,8 +86,12 @@ exports[`Integration Header Test Renders integration header as expected 1`] = `
                       viewBox="0 0 16 16"
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
-                    />
-                  </EuiIconEmpty>
+                    >
+                      <path
+                        d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                      />
+                    </svg>
+                  </EuiIconBeaker>
                 </EuiIcon>
               </a>
             </EuiLink>
diff --git a/public/components/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap b/public/components/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap
index ac06da656e..8f555a0d9b 100644
--- a/public/components/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap
+++ b/public/components/integrations/components/__tests__/__snapshots__/setup_integration.test.tsx.snap
@@ -288,7 +288,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                                   size="m"
                                                   type="arrowDown"
                                                 >
-                                                  <EuiIconEmpty
+                                                  <EuiIconBeaker
                                                     aria-hidden={true}
                                                     className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                                     focusable="false"
@@ -305,8 +305,12 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                                       viewBox="0 0 16 16"
                                                       width={16}
                                                       xmlns="http://www.w3.org/2000/svg"
-                                                    />
-                                                  </EuiIconEmpty>
+                                                    >
+                                                      <path
+                                                        d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                      />
+                                                    </svg>
+                                                  </EuiIconBeaker>
                                                 </EuiIcon>
                                               </span>
                                             </EuiFormControlLayoutCustomIcon>
@@ -590,7 +594,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                                         className="euiFormControlLayoutClearButton__icon"
                                                         type="cross"
                                                       >
-                                                        <EuiIconEmpty
+                                                        <EuiIconBeaker
                                                           aria-hidden={true}
                                                           className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutClearButton__icon"
                                                           focusable="false"
@@ -607,8 +611,12 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                                             viewBox="0 0 16 16"
                                                             width={16}
                                                             xmlns="http://www.w3.org/2000/svg"
-                                                          />
-                                                        </EuiIconEmpty>
+                                                          >
+                                                            <path
+                                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                            />
+                                                          </svg>
+                                                        </EuiIconBeaker>
                                                       </EuiIcon>
                                                     </button>
                                                   </EuiI18n>
@@ -641,7 +649,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                                       size="m"
                                                       type="arrowDown"
                                                     >
-                                                      <EuiIconEmpty
+                                                      <EuiIconBeaker
                                                         aria-hidden={true}
                                                         className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                                         focusable="false"
@@ -658,8 +666,12 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                                           viewBox="0 0 16 16"
                                                           width={16}
                                                           xmlns="http://www.w3.org/2000/svg"
-                                                        />
-                                                      </EuiIconEmpty>
+                                                        >
+                                                          <path
+                                                            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                          />
+                                                        </svg>
+                                                      </EuiIconBeaker>
                                                     </EuiIcon>
                                                   </button>
                                                 </EuiFormControlLayoutCustomIcon>
@@ -751,7 +763,11 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                   viewBox="0 0 16 16"
                                   width="16"
                                   xmlns="http://www.w3.org/2000/svg"
-                                />
+                                >
+                                  <path
+                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                  />
+                                </svg>
                                 <span
                                   class="euiButtonEmpty__text"
                                 >
@@ -781,7 +797,11 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                   viewBox="0 0 16 16"
                                   width="16"
                                   xmlns="http://www.w3.org/2000/svg"
-                                />
+                                >
+                                  <path
+                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                  />
+                                </svg>
                                 <span
                                   class="euiButton__text"
                                 >
@@ -868,7 +888,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                         size="m"
                                         type="cross"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                           focusable="false"
@@ -885,8 +905,12 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                       <span
                                         className="euiButtonEmpty__text"
@@ -959,7 +983,7 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                           size="m"
                                           type="arrowRight"
                                         >
-                                          <EuiIconEmpty
+                                          <EuiIconBeaker
                                             aria-hidden={true}
                                             className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                             focusable="false"
@@ -976,8 +1000,12 @@ exports[`Integration Setup Page Renders integration setup page as expected 1`] =
                                               viewBox="0 0 16 16"
                                               width={16}
                                               xmlns="http://www.w3.org/2000/svg"
-                                            />
-                                          </EuiIconEmpty>
+                                            >
+                                              <path
+                                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                              />
+                                            </svg>
+                                          </EuiIconBeaker>
                                         </EuiIcon>
                                         <span
                                           className="euiButton__text"
diff --git a/public/components/metrics/sidebar/__tests__/__snapshots__/searchbar.test.tsx.snap b/public/components/metrics/sidebar/__tests__/__snapshots__/searchbar.test.tsx.snap
index a22b6b5f7b..afed99ffe0 100644
--- a/public/components/metrics/sidebar/__tests__/__snapshots__/searchbar.test.tsx.snap
+++ b/public/components/metrics/sidebar/__tests__/__snapshots__/searchbar.test.tsx.snap
@@ -263,7 +263,7 @@ exports[`Search Bar Component Search Side Bar Component with no available metric
                                     size="m"
                                     type="search"
                                   >
-                                    <EuiIconEmpty
+                                    <EuiIconBeaker
                                       aria-hidden={true}
                                       className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
@@ -280,8 +280,12 @@ exports[`Search Bar Component Search Side Bar Component with no available metric
                                         viewBox="0 0 16 16"
                                         width={16}
                                         xmlns="http://www.w3.org/2000/svg"
-                                      />
-                                    </EuiIconEmpty>
+                                      >
+                                        <path
+                                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                        />
+                                      </svg>
+                                    </EuiIconBeaker>
                                   </EuiIcon>
                                 </span>
                               </EuiFormControlLayoutCustomIcon>
diff --git a/public/components/metrics/sidebar/__tests__/__snapshots__/sidebar.test.tsx.snap b/public/components/metrics/sidebar/__tests__/__snapshots__/sidebar.test.tsx.snap
index 898fc9dfd0..a22e4729ce 100644
--- a/public/components/metrics/sidebar/__tests__/__snapshots__/sidebar.test.tsx.snap
+++ b/public/components/metrics/sidebar/__tests__/__snapshots__/sidebar.test.tsx.snap
@@ -198,7 +198,7 @@ exports[`Side Bar Component renders Side Bar Component 1`] = `
                                               size="m"
                                               type="search"
                                             >
-                                              <EuiIconEmpty
+                                              <EuiIconBeaker
                                                 aria-hidden={true}
                                                 className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                                 focusable="false"
@@ -215,8 +215,12 @@ exports[`Side Bar Component renders Side Bar Component 1`] = `
                                                   viewBox="0 0 16 16"
                                                   width={16}
                                                   xmlns="http://www.w3.org/2000/svg"
-                                                />
-                                              </EuiIconEmpty>
+                                                >
+                                                  <path
+                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                  />
+                                                </svg>
+                                              </EuiIconBeaker>
                                             </EuiIcon>
                                           </span>
                                         </EuiFormControlLayoutCustomIcon>
@@ -293,7 +297,7 @@ exports[`Side Bar Component renders Side Bar Component 1`] = `
                             size="m"
                             type="arrowRight"
                           >
-                            <EuiIconEmpty
+                            <EuiIconBeaker
                               aria-hidden={true}
                               className="euiIcon euiIcon--medium euiIcon-isLoading euiAccordion__icon euiAccordion__icon-isOpen"
                               focusable="false"
@@ -310,8 +314,12 @@ exports[`Side Bar Component renders Side Bar Component 1`] = `
                                 viewBox="0 0 16 16"
                                 width={16}
                                 xmlns="http://www.w3.org/2000/svg"
-                              />
-                            </EuiIconEmpty>
+                              >
+                                <path
+                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                />
+                              </svg>
+                            </EuiIconBeaker>
                           </EuiIcon>
                         </span>
                         <span
@@ -413,7 +421,7 @@ exports[`Side Bar Component renders Side Bar Component 1`] = `
                             size="m"
                             type="arrowRight"
                           >
-                            <EuiIconEmpty
+                            <EuiIconBeaker
                               aria-hidden={true}
                               className="euiIcon euiIcon--medium euiIcon-isLoading euiAccordion__icon euiAccordion__icon-isOpen"
                               focusable="false"
@@ -430,8 +438,12 @@ exports[`Side Bar Component renders Side Bar Component 1`] = `
                                 viewBox="0 0 16 16"
                                 width={16}
                                 xmlns="http://www.w3.org/2000/svg"
-                              />
-                            </EuiIconEmpty>
+                              >
+                                <path
+                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                />
+                              </svg>
+                            </EuiIconBeaker>
                           </EuiIcon>
                         </span>
                         <span
diff --git a/public/components/metrics/top_menu/__tests__/__snapshots__/metrics_export.test.tsx.snap b/public/components/metrics/top_menu/__tests__/__snapshots__/metrics_export.test.tsx.snap
index 5a8ed3fb75..d06fedab9f 100644
--- a/public/components/metrics/top_menu/__tests__/__snapshots__/metrics_export.test.tsx.snap
+++ b/public/components/metrics/top_menu/__tests__/__snapshots__/metrics_export.test.tsx.snap
@@ -85,7 +85,7 @@ exports[`Export Metrics Panel Component renders Export Metrics Panel Component 1
                           size="m"
                           type="arrowDown"
                         >
-                          <EuiIconEmpty
+                          <EuiIconBeaker
                             aria-hidden={true}
                             className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                             focusable="false"
@@ -102,8 +102,12 @@ exports[`Export Metrics Panel Component renders Export Metrics Panel Component 1
                               viewBox="0 0 16 16"
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </EuiIconEmpty>
+                            >
+                              <path
+                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                              />
+                            </svg>
+                          </EuiIconBeaker>
                         </EuiIcon>
                         <span
                           className="euiButton__text"
diff --git a/public/components/metrics/top_menu/__tests__/__snapshots__/metrics_export_panel.test.tsx.snap b/public/components/metrics/top_menu/__tests__/__snapshots__/metrics_export_panel.test.tsx.snap
index b961492493..9ea61d7515 100644
--- a/public/components/metrics/top_menu/__tests__/__snapshots__/metrics_export_panel.test.tsx.snap
+++ b/public/components/metrics/top_menu/__tests__/__snapshots__/metrics_export_panel.test.tsx.snap
@@ -308,7 +308,7 @@ exports[`Export Metrics Panel Component renders Export Metrics Panel Component 1
                                   size="m"
                                   type="arrowDown"
                                 >
-                                  <EuiIconEmpty
+                                  <EuiIconBeaker
                                     aria-hidden={true}
                                     className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                     focusable="false"
@@ -325,8 +325,12 @@ exports[`Export Metrics Panel Component renders Export Metrics Panel Component 1
                                       viewBox="0 0 16 16"
                                       width={16}
                                       xmlns="http://www.w3.org/2000/svg"
-                                    />
-                                  </EuiIconEmpty>
+                                    >
+                                      <path
+                                        d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                      />
+                                    </svg>
+                                  </EuiIconBeaker>
                                 </EuiIcon>
                               </button>
                             </EuiFormControlLayoutCustomIcon>
diff --git a/public/components/metrics/top_menu/__tests__/__snapshots__/top_menu.test.tsx.snap b/public/components/metrics/top_menu/__tests__/__snapshots__/top_menu.test.tsx.snap
index cb3497bdcf..9c64eae1cd 100644
--- a/public/components/metrics/top_menu/__tests__/__snapshots__/top_menu.test.tsx.snap
+++ b/public/components/metrics/top_menu/__tests__/__snapshots__/top_menu.test.tsx.snap
@@ -253,7 +253,7 @@ exports[`Metrics Top Menu Component renders Top Menu Component when enabled 1`]
                                       size="m"
                                       type="arrowDown"
                                     >
-                                      <EuiIconEmpty
+                                      <EuiIconBeaker
                                         aria-hidden={true}
                                         className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                         focusable="false"
@@ -270,8 +270,12 @@ exports[`Metrics Top Menu Component renders Top Menu Component when enabled 1`]
                                           viewBox="0 0 16 16"
                                           width={16}
                                           xmlns="http://www.w3.org/2000/svg"
-                                        />
-                                      </EuiIconEmpty>
+                                        >
+                                          <path
+                                            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                          />
+                                        </svg>
+                                      </EuiIconBeaker>
                                     </EuiIcon>
                                   </span>
                                 </EuiFormControlLayoutCustomIcon>
@@ -563,7 +567,7 @@ exports[`Metrics Top Menu Component renders Top Menu Component when enabled 1`]
                                             size="s"
                                             type="arrowDown"
                                           >
-                                            <EuiIconEmpty
+                                            <EuiIconBeaker
                                               aria-hidden={true}
                                               className="euiIcon euiIcon--small euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                               focusable="false"
@@ -580,8 +584,12 @@ exports[`Metrics Top Menu Component renders Top Menu Component when enabled 1`]
                                                 viewBox="0 0 16 16"
                                                 width={16}
                                                 xmlns="http://www.w3.org/2000/svg"
-                                              />
-                                            </EuiIconEmpty>
+                                              >
+                                                <path
+                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                />
+                                              </svg>
+                                            </EuiIconBeaker>
                                           </EuiIcon>
                                           <span
                                             className="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
@@ -589,7 +597,7 @@ exports[`Metrics Top Menu Component renders Top Menu Component when enabled 1`]
                                             <EuiIcon
                                               type="calendar"
                                             >
-                                              <EuiIconEmpty
+                                              <EuiIconBeaker
                                                 aria-hidden={true}
                                                 className="euiIcon euiIcon--medium euiIcon-isLoading"
                                                 focusable="false"
@@ -606,8 +614,12 @@ exports[`Metrics Top Menu Component renders Top Menu Component when enabled 1`]
                                                   viewBox="0 0 16 16"
                                                   width={16}
                                                   xmlns="http://www.w3.org/2000/svg"
-                                                />
-                                              </EuiIconEmpty>
+                                                >
+                                                  <path
+                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                  />
+                                                </svg>
+                                              </EuiIconBeaker>
                                             </EuiIcon>
                                           </span>
                                         </span>
@@ -753,7 +765,7 @@ exports[`Metrics Top Menu Component renders Top Menu Component when enabled 1`]
                                         size="m"
                                         type="refresh"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                           focusable="false"
@@ -770,8 +782,12 @@ exports[`Metrics Top Menu Component renders Top Menu Component when enabled 1`]
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                       <span
                                         className="euiButton__text euiSuperUpdateButton__text"
@@ -877,7 +893,7 @@ exports[`Metrics Top Menu Component renders Top Menu Component when enabled 1`]
                                     size="m"
                                     type="arrowDown"
                                   >
-                                    <EuiIconEmpty
+                                    <EuiIconBeaker
                                       aria-hidden={true}
                                       className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                       focusable="false"
@@ -894,8 +910,12 @@ exports[`Metrics Top Menu Component renders Top Menu Component when enabled 1`]
                                         viewBox="0 0 16 16"
                                         width={16}
                                         xmlns="http://www.w3.org/2000/svg"
-                                      />
-                                    </EuiIconEmpty>
+                                      >
+                                        <path
+                                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                        />
+                                      </svg>
+                                    </EuiIconBeaker>
                                   </EuiIcon>
                                   <span
                                     className="euiButton__text"
diff --git a/public/components/metrics/view/__tests__/__snapshots__/empty_view.test.tsx.snap b/public/components/metrics/view/__tests__/__snapshots__/empty_view.test.tsx.snap
index c9427636e0..efd6ef1f19 100644
--- a/public/components/metrics/view/__tests__/__snapshots__/empty_view.test.tsx.snap
+++ b/public/components/metrics/view/__tests__/__snapshots__/empty_view.test.tsx.snap
@@ -20,7 +20,7 @@ exports[`Empty View Component renders empty view container without metrics 1`] =
                 size="xxl"
                 type="minusInCircle"
               >
-                <EuiIconEmpty
+                <EuiIconBeaker
                   aria-hidden={true}
                   className="euiIcon euiIcon--xxLarge euiIcon-isLoading"
                   focusable="false"
@@ -37,8 +37,12 @@ exports[`Empty View Component renders empty view container without metrics 1`] =
                     viewBox="0 0 16 16"
                     width={16}
                     xmlns="http://www.w3.org/2000/svg"
-                  />
-                </EuiIconEmpty>
+                  >
+                    <path
+                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                    />
+                  </svg>
+                </EuiIconBeaker>
               </EuiIcon>
               <EuiSpacer
                 size="s"
diff --git a/public/components/notebooks/components/__tests__/__snapshots__/note_table.test.tsx.snap b/public/components/notebooks/components/__tests__/__snapshots__/note_table.test.tsx.snap
index 43e5d8220c..a180c49998 100644
--- a/public/components/notebooks/components/__tests__/__snapshots__/note_table.test.tsx.snap
+++ b/public/components/notebooks/components/__tests__/__snapshots__/note_table.test.tsx.snap
@@ -181,7 +181,11 @@ exports[`<NoteTable /> spec renders the component 1`] = `
                   viewBox="0 0 16 16"
                   width="16"
                   xmlns="http://www.w3.org/2000/svg"
-                />
+                >
+                  <path
+                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                  />
+                </svg>
               </span>
             </div>
           </div>
@@ -358,7 +362,11 @@ exports[`<NoteTable /> spec renders the component 1`] = `
                           viewBox="0 0 16 16"
                           width="16"
                           xmlns="http://www.w3.org/2000/svg"
-                        />
+                        >
+                          <path
+                            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                          />
+                        </svg>
                       </span>
                     </button>
                   </th>
@@ -841,7 +849,11 @@ exports[`<NoteTable /> spec renders the component 1`] = `
                       viewBox="0 0 16 16"
                       width="16"
                       xmlns="http://www.w3.org/2000/svg"
-                    />
+                    >
+                      <path
+                        d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                      />
+                    </svg>
                   </button>
                   <ul
                     class="euiPagination__list"
@@ -886,7 +898,11 @@ exports[`<NoteTable /> spec renders the component 1`] = `
                       viewBox="0 0 16 16"
                       width="16"
                       xmlns="http://www.w3.org/2000/svg"
-                    />
+                    >
+                      <path
+                        d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                      />
+                    </svg>
                   </button>
                 </nav>
               </div>
@@ -973,7 +989,11 @@ exports[`<NoteTable /> spec renders the empty component 1`] = `
                     viewBox="0 0 16 16"
                     width="16"
                     xmlns="http://www.w3.org/2000/svg"
-                  />
+                  >
+                    <path
+                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                    />
+                  </svg>
                 </a>
               </div>
             </div>
@@ -1009,7 +1029,11 @@ exports[`<NoteTable /> spec renders the empty component 1`] = `
                           viewBox="0 0 16 16"
                           width="16"
                           xmlns="http://www.w3.org/2000/svg"
-                        />
+                        >
+                          <path
+                            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                          />
+                        </svg>
                         <span
                           class="euiButton__text"
                         >
diff --git a/public/components/notebooks/components/__tests__/__snapshots__/notebook.test.tsx.snap b/public/components/notebooks/components/__tests__/__snapshots__/notebook.test.tsx.snap
index b2bc5ba057..a55b86bc52 100644
--- a/public/components/notebooks/components/__tests__/__snapshots__/notebook.test.tsx.snap
+++ b/public/components/notebooks/components/__tests__/__snapshots__/notebook.test.tsx.snap
@@ -48,7 +48,11 @@ exports[`<Notebook /> spec Renders the empty component 1`] = `
                     viewBox="0 0 16 16"
                     width="16"
                     xmlns="http://www.w3.org/2000/svg"
-                  />
+                  >
+                    <path
+                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                    />
+                  </svg>
                   <span
                     class="euiButton__text"
                   >
@@ -129,7 +133,11 @@ exports[`<Notebook /> spec Renders the empty component 1`] = `
                     viewBox="0 0 16 16"
                     width="16"
                     xmlns="http://www.w3.org/2000/svg"
-                  />
+                  >
+                    <path
+                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                    />
+                  </svg>
                   <span
                     class="euiButton__text"
                   >
@@ -224,7 +232,11 @@ exports[`<Notebook /> spec Renders the empty component 1`] = `
                     viewBox="0 0 16 16"
                     width="16"
                     xmlns="http://www.w3.org/2000/svg"
-                  />
+                  >
+                    <path
+                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                    />
+                  </svg>
                 </div>
                 <div
                   class="euiCard__content"
@@ -283,7 +295,11 @@ exports[`<Notebook /> spec Renders the empty component 1`] = `
                     viewBox="0 0 16 16"
                     width="16"
                     xmlns="http://www.w3.org/2000/svg"
-                  />
+                  >
+                    <path
+                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                    />
+                  </svg>
                 </div>
                 <div
                   class="euiCard__content"
diff --git a/public/components/notebooks/components/paragraph_components/__tests__/__snapshots__/para_input.test.tsx.snap b/public/components/notebooks/components/paragraph_components/__tests__/__snapshots__/para_input.test.tsx.snap
index a328c3d42b..8198f70fa1 100644
--- a/public/components/notebooks/components/paragraph_components/__tests__/__snapshots__/para_input.test.tsx.snap
+++ b/public/components/notebooks/components/paragraph_components/__tests__/__snapshots__/para_input.test.tsx.snap
@@ -42,7 +42,11 @@ exports[`<para_input /> spec renders the markdown component 1`] = `
             viewBox="0 0 16 16"
             width="16"
             xmlns="http://www.w3.org/2000/svg"
-          />
+          >
+            <path
+              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+            />
+          </svg>
         </button>
       </div>
     </div>
@@ -137,7 +141,11 @@ exports[`<para_input /> spec renders the visualization component 1`] = `
                       viewBox="0 0 16 16"
                       width="16"
                       xmlns="http://www.w3.org/2000/svg"
-                    />
+                    >
+                      <path
+                        d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                      />
+                    </svg>
                   </button>
                   <button
                     aria-label="Open list of options"
@@ -154,7 +162,11 @@ exports[`<para_input /> spec renders the visualization component 1`] = `
                       viewBox="0 0 16 16"
                       width="16"
                       xmlns="http://www.w3.org/2000/svg"
-                    />
+                    >
+                      <path
+                        d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                      />
+                    </svg>
                   </button>
                 </div>
               </div>
@@ -238,7 +250,11 @@ exports[`<para_input /> spec renders the visualization component 1`] = `
                           viewBox="0 0 16 16"
                           width="16"
                           xmlns="http://www.w3.org/2000/svg"
-                        />
+                        >
+                          <path
+                            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                          />
+                        </svg>
                         <span
                           class="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
                         >
@@ -251,7 +267,11 @@ exports[`<para_input /> spec renders the visualization component 1`] = `
                             viewBox="0 0 16 16"
                             width="16"
                             xmlns="http://www.w3.org/2000/svg"
-                          />
+                          >
+                            <path
+                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                            />
+                          </svg>
                         </span>
                       </span>
                     </button>
diff --git a/public/components/notebooks/components/paragraph_components/__tests__/__snapshots__/paragraphs.test.tsx.snap b/public/components/notebooks/components/paragraph_components/__tests__/__snapshots__/paragraphs.test.tsx.snap
index c28f96d28d..df055e89ca 100644
--- a/public/components/notebooks/components/paragraph_components/__tests__/__snapshots__/paragraphs.test.tsx.snap
+++ b/public/components/notebooks/components/paragraph_components/__tests__/__snapshots__/paragraphs.test.tsx.snap
@@ -29,7 +29,11 @@ exports[`<Paragraphs /> spec renders the component 1`] = `
             viewBox="0 0 16 16"
             width="16"
             xmlns="http://www.w3.org/2000/svg"
-          />
+          >
+            <path
+              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+            />
+          </svg>
         </button>
       </div>
     </div>
@@ -56,7 +60,11 @@ exports[`<Paragraphs /> spec renders the component 1`] = `
               viewBox="0 0 16 16"
               width="16"
               xmlns="http://www.w3.org/2000/svg"
-            />
+            >
+              <path
+                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+              />
+            </svg>
           </button>
         </div>
       </div>
@@ -119,7 +127,11 @@ exports[`<Paragraphs /> spec renders the component 1`] = `
                     viewBox="0 0 16 16"
                     width="16"
                     xmlns="http://www.w3.org/2000/svg"
-                  />
+                  >
+                    <path
+                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                    />
+                  </svg>
                 </button>
               </div>
             </div>
@@ -150,7 +162,11 @@ exports[`<Paragraphs /> spec renders the component 1`] = `
                 viewBox="0 0 16 16"
                 width="16"
                 xmlns="http://www.w3.org/2000/svg"
-              />
+              >
+                <path
+                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                />
+              </svg>
                
               <svg
                 aria-hidden="true"
@@ -162,7 +178,11 @@ exports[`<Paragraphs /> spec renders the component 1`] = `
                 viewBox="0 0 16 16"
                 width="16"
                 xmlns="http://www.w3.org/2000/svg"
-              />
+              >
+                <path
+                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                />
+              </svg>
               <span
                 class="euiScreenReaderOnly"
               >
@@ -187,7 +207,11 @@ exports[`<Paragraphs /> spec renders the component 1`] = `
                 viewBox="0 0 16 16"
                 width="16"
                 xmlns="http://www.w3.org/2000/svg"
-              />
+              >
+                <path
+                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                />
+              </svg>
               <svg
                 aria-hidden="true"
                 aria-label="External link"
@@ -198,7 +222,11 @@ exports[`<Paragraphs /> spec renders the component 1`] = `
                 viewBox="0 0 16 16"
                 width="16"
                 xmlns="http://www.w3.org/2000/svg"
-              />
+              >
+                <path
+                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                />
+              </svg>
               <span
                 class="euiScreenReaderOnly"
               >
@@ -249,7 +277,11 @@ exports[`<Paragraphs /> spec renders the component 1`] = `
           viewBox="0 0 16 16"
           width="16"
           xmlns="http://www.w3.org/2000/svg"
-        />
+        >
+          <path
+            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+          />
+        </svg>
       </div>
       <div
         class="euiFlexItem"
diff --git a/public/components/trace_analytics/components/common/__tests__/__snapshots__/search_bar.test.tsx.snap b/public/components/trace_analytics/components/common/__tests__/__snapshots__/search_bar.test.tsx.snap
index 7e0ac79f13..fac00f954a 100644
--- a/public/components/trace_analytics/components/common/__tests__/__snapshots__/search_bar.test.tsx.snap
+++ b/public/components/trace_analytics/components/common/__tests__/__snapshots__/search_bar.test.tsx.snap
@@ -271,7 +271,7 @@ exports[`Search bar components renders date picker 1`] = `
                                 size="s"
                                 type="arrowDown"
                               >
-                                <EuiIconEmpty
+                                <EuiIconBeaker
                                   aria-hidden={true}
                                   className="euiIcon euiIcon--small euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                   focusable="false"
@@ -288,8 +288,12 @@ exports[`Search bar components renders date picker 1`] = `
                                     viewBox="0 0 16 16"
                                     width={16}
                                     xmlns="http://www.w3.org/2000/svg"
-                                  />
-                                </EuiIconEmpty>
+                                  >
+                                    <path
+                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                    />
+                                  </svg>
+                                </EuiIconBeaker>
                               </EuiIcon>
                               <span
                                 className="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
@@ -297,7 +301,7 @@ exports[`Search bar components renders date picker 1`] = `
                                 <EuiIcon
                                   type="calendar"
                                 >
-                                  <EuiIconEmpty
+                                  <EuiIconBeaker
                                     aria-hidden={true}
                                     className="euiIcon euiIcon--medium euiIcon-isLoading"
                                     focusable="false"
@@ -314,8 +318,12 @@ exports[`Search bar components renders date picker 1`] = `
                                       viewBox="0 0 16 16"
                                       width={16}
                                       xmlns="http://www.w3.org/2000/svg"
-                                    />
-                                  </EuiIconEmpty>
+                                    >
+                                      <path
+                                        d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                      />
+                                    </svg>
+                                  </EuiIconBeaker>
                                 </EuiIcon>
                               </span>
                             </span>
@@ -451,7 +459,7 @@ exports[`Search bar components renders search bar 1`] = `
                             size="m"
                             type="search"
                           >
-                            <EuiIconEmpty
+                            <EuiIconBeaker
                               aria-hidden={true}
                               className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                               focusable="false"
@@ -468,8 +476,12 @@ exports[`Search bar components renders search bar 1`] = `
                                 viewBox="0 0 16 16"
                                 width={16}
                                 xmlns="http://www.w3.org/2000/svg"
-                              />
-                            </EuiIconEmpty>
+                              >
+                                <path
+                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                />
+                              </svg>
+                            </EuiIconBeaker>
                           </EuiIcon>
                         </span>
                       </EuiFormControlLayoutCustomIcon>
@@ -931,7 +943,7 @@ exports[`Search bar components renders search bar 1`] = `
                       size="m"
                       type="refresh"
                     >
-                      <EuiIconEmpty
+                      <EuiIconBeaker
                         aria-hidden={true}
                         className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                         focusable="false"
@@ -948,8 +960,12 @@ exports[`Search bar components renders search bar 1`] = `
                           viewBox="0 0 16 16"
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
-                        />
-                      </EuiIconEmpty>
+                        >
+                          <path
+                            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                          />
+                        </svg>
+                      </EuiIconBeaker>
                     </EuiIcon>
                     <span
                       className="euiButton__text"
@@ -1052,7 +1068,7 @@ exports[`Search bar components renders search bar 1`] = `
                           size="m"
                           type="filter"
                         >
-                          <EuiIconEmpty
+                          <EuiIconBeaker
                             aria-hidden={true}
                             className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                             focusable="false"
@@ -1069,8 +1085,12 @@ exports[`Search bar components renders search bar 1`] = `
                               viewBox="0 0 16 16"
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </EuiIconEmpty>
+                            >
+                              <path
+                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                              />
+                            </svg>
+                          </EuiIconBeaker>
                         </EuiIcon>
                       </button>
                     </EuiButtonIcon>
diff --git a/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filter_edit_popover.test.tsx.snap b/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filter_edit_popover.test.tsx.snap
index 7fde9a70a6..8dc64c168d 100644
--- a/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filter_edit_popover.test.tsx.snap
+++ b/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filter_edit_popover.test.tsx.snap
@@ -290,7 +290,7 @@ exports[`Filter popover component renders filter popover 1`] = `
                                         size="m"
                                         type="arrowDown"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                           focusable="false"
@@ -307,8 +307,12 @@ exports[`Filter popover component renders filter popover 1`] = `
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </button>
                                   </EuiFormControlLayoutCustomIcon>
@@ -554,7 +558,7 @@ exports[`Filter popover component renders filter popover 1`] = `
                                         size="m"
                                         type="arrowDown"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                           focusable="false"
@@ -571,8 +575,12 @@ exports[`Filter popover component renders filter popover 1`] = `
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </button>
                                   </EuiFormControlLayoutCustomIcon>
diff --git a/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filters.test.tsx.snap b/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filters.test.tsx.snap
index 3d483d4dd2..e886fa6400 100644
--- a/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filters.test.tsx.snap
+++ b/public/components/trace_analytics/components/common/filters/__tests__/__snapshots__/filters.test.tsx.snap
@@ -80,7 +80,7 @@ exports[`Filter component renders filters 1`] = `
                         size="m"
                         type="filter"
                       >
-                        <EuiIconEmpty
+                        <EuiIconBeaker
                           aria-hidden={true}
                           className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                           focusable="false"
@@ -97,8 +97,12 @@ exports[`Filter component renders filters 1`] = `
                             viewBox="0 0 16 16"
                             width={16}
                             xmlns="http://www.w3.org/2000/svg"
-                          />
-                        </EuiIconEmpty>
+                          >
+                            <path
+                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                            />
+                          </svg>
+                        </EuiIconBeaker>
                       </EuiIcon>
                     </button>
                   </EuiButtonIcon>
diff --git a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard.test.tsx.snap b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard.test.tsx.snap
index f828066af8..1fff402475 100644
--- a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard.test.tsx.snap
+++ b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard.test.tsx.snap
@@ -1405,7 +1405,7 @@ exports[`Dashboard component renders empty dashboard 1`] = `
                     size="m"
                     type="arrowDown"
                   >
-                    <EuiIconEmpty
+                    <EuiIconBeaker
                       aria-hidden={true}
                       className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                       focusable="false"
@@ -1422,8 +1422,12 @@ exports[`Dashboard component renders empty dashboard 1`] = `
                         viewBox="0 0 16 16"
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
-                      />
-                    </EuiIconEmpty>
+                      >
+                        <path
+                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                        />
+                      </svg>
+                    </EuiIconBeaker>
                   </EuiIcon>
                   <span
                     className="euiButtonEmpty__text"
diff --git a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard_table.test.tsx.snap b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard_table.test.tsx.snap
index fdabcbc281..082b5caf23 100644
--- a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard_table.test.tsx.snap
+++ b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/dashboard_table.test.tsx.snap
@@ -984,7 +984,7 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                               size="s"
                                               type="arrowDown"
                                             >
-                                              <EuiIconEmpty
+                                              <EuiIconBeaker
                                                 aria-hidden={true}
                                                 className="euiIcon euiIcon--small euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                 focusable="false"
@@ -1001,8 +1001,12 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                                   viewBox="0 0 16 16"
                                                   width={16}
                                                   xmlns="http://www.w3.org/2000/svg"
-                                                />
-                                              </EuiIconEmpty>
+                                                >
+                                                  <path
+                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                  />
+                                                </svg>
+                                              </EuiIconBeaker>
                                             </EuiIcon>
                                             <span
                                               className="euiButtonEmpty__text"
@@ -1126,7 +1130,7 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                                 size="s"
                                                 type="questionInCircle"
                                               >
-                                                <EuiIconEmpty
+                                                <EuiIconBeaker
                                                   aria-hidden={true}
                                                   className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                                   focusable="false"
@@ -1143,8 +1147,12 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                                     viewBox="0 0 16 16"
                                                     width={16}
                                                     xmlns="http://www.w3.org/2000/svg"
-                                                  />
-                                                </EuiIconEmpty>
+                                                  >
+                                                    <path
+                                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                    />
+                                                  </svg>
+                                                </EuiIconBeaker>
                                               </EuiIcon>
                                             </div>
                                             <div>
@@ -1241,7 +1249,7 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                                 size="s"
                                                 type="questionInCircle"
                                               >
-                                                <EuiIconEmpty
+                                                <EuiIconBeaker
                                                   aria-hidden={true}
                                                   className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                                   focusable="false"
@@ -1258,8 +1266,12 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                                     viewBox="0 0 16 16"
                                                     width={16}
                                                     xmlns="http://www.w3.org/2000/svg"
-                                                  />
-                                                </EuiIconEmpty>
+                                                  >
+                                                    <path
+                                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                    />
+                                                  </svg>
+                                                </EuiIconBeaker>
                                               </EuiIcon>
                                             </span>
                                           </span>
@@ -1291,7 +1303,7 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                     size="m"
                                     type="sortDown"
                                   >
-                                    <EuiIconEmpty
+                                    <EuiIconBeaker
                                       aria-hidden={true}
                                       className="euiIcon euiIcon--medium euiIcon-isLoading euiTableSortIcon"
                                       focusable="false"
@@ -1308,8 +1320,12 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                         viewBox="0 0 16 16"
                                         width={16}
                                         xmlns="http://www.w3.org/2000/svg"
-                                      />
-                                    </EuiIconEmpty>
+                                      >
+                                        <path
+                                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                        />
+                                      </svg>
+                                    </EuiIconBeaker>
                                   </EuiIcon>
                                 </span>
                               </CellContents>
@@ -1391,7 +1407,7 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                                 size="s"
                                                 type="questionInCircle"
                                               >
-                                                <EuiIconEmpty
+                                                <EuiIconBeaker
                                                   aria-hidden={true}
                                                   className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                                   focusable="false"
@@ -1408,8 +1424,12 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                                     viewBox="0 0 16 16"
                                                     width={16}
                                                     xmlns="http://www.w3.org/2000/svg"
-                                                  />
-                                                </EuiIconEmpty>
+                                                  >
+                                                    <path
+                                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                    />
+                                                  </svg>
+                                                </EuiIconBeaker>
                                               </EuiIcon>
                                             </div>
                                             <div>
@@ -1489,7 +1509,7 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                               size="s"
                                               type="questionInCircle"
                                             >
-                                              <EuiIconEmpty
+                                              <EuiIconBeaker
                                                 aria-hidden={true}
                                                 className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                                 focusable="false"
@@ -1506,8 +1526,12 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                                   viewBox="0 0 16 16"
                                                   width={16}
                                                   xmlns="http://www.w3.org/2000/svg"
-                                                />
-                                              </EuiIconEmpty>
+                                                >
+                                                  <path
+                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                  />
+                                                </svg>
+                                              </EuiIconBeaker>
                                             </EuiIcon>
                                           </div>
                                           <div>
@@ -1597,7 +1621,7 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                                 size="s"
                                                 type="questionInCircle"
                                               >
-                                                <EuiIconEmpty
+                                                <EuiIconBeaker
                                                   aria-hidden={true}
                                                   className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                                   focusable="false"
@@ -1614,8 +1638,12 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                                     viewBox="0 0 16 16"
                                                     width={16}
                                                     xmlns="http://www.w3.org/2000/svg"
-                                                  />
-                                                </EuiIconEmpty>
+                                                  >
+                                                    <path
+                                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                    />
+                                                  </svg>
+                                                </EuiIconBeaker>
                                               </EuiIcon>
                                             </div>
                                             <div>
@@ -1706,7 +1734,7 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                                 size="s"
                                                 type="questionInCircle"
                                               >
-                                                <EuiIconEmpty
+                                                <EuiIconBeaker
                                                   aria-hidden={true}
                                                   className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                                   focusable="false"
@@ -1723,8 +1751,12 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                                     viewBox="0 0 16 16"
                                                     width={16}
                                                     xmlns="http://www.w3.org/2000/svg"
-                                                  />
-                                                </EuiIconEmpty>
+                                                  >
+                                                    <path
+                                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                    />
+                                                  </svg>
+                                                </EuiIconBeaker>
                                               </EuiIcon>
                                             </div>
                                             <div>
@@ -1828,7 +1860,7 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                         size="s"
                                         type="questionInCircle"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                           focusable="false"
@@ -1845,8 +1877,12 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </div>
                                     <div>
@@ -1959,7 +1995,7 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                         size="s"
                                         type="questionInCircle"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                           focusable="false"
@@ -1976,8 +2012,12 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </span>
                                   </span>
@@ -2397,7 +2437,7 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                         size="s"
                                         type="questionInCircle"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                           focusable="false"
@@ -2414,8 +2454,12 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </div>
                                     <div>
@@ -2506,7 +2550,7 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                         size="s"
                                         type="questionInCircle"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                           focusable="false"
@@ -2523,8 +2567,12 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </div>
                                     <div>
@@ -2615,7 +2663,7 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                         size="s"
                                         type="questionInCircle"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                           focusable="false"
@@ -2632,8 +2680,12 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </div>
                                     <div>
@@ -2734,7 +2786,7 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                         size="s"
                                         type="questionInCircle"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                           focusable="false"
@@ -2751,8 +2803,12 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </div>
                                     <div>
@@ -2916,7 +2972,7 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                           size="s"
                                           type="arrowDown"
                                         >
-                                          <EuiIconEmpty
+                                          <EuiIconBeaker
                                             aria-hidden={true}
                                             className="euiIcon euiIcon--small euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                             focusable="false"
@@ -2933,8 +2989,12 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                               viewBox="0 0 16 16"
                                               width={16}
                                               xmlns="http://www.w3.org/2000/svg"
-                                            />
-                                          </EuiIconEmpty>
+                                            >
+                                              <path
+                                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                              />
+                                            </svg>
+                                          </EuiIconBeaker>
                                         </EuiIcon>
                                         <span
                                           className="euiButtonEmpty__text"
@@ -3008,7 +3068,7 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                         size="m"
                                         type="arrowLeft"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                           focusable="false"
@@ -3025,8 +3085,12 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </button>
                                   </EuiButtonIcon>
@@ -3155,7 +3219,7 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                         size="m"
                                         type="arrowRight"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                           focusable="false"
@@ -3172,8 +3236,12 @@ exports[`Dashboard table component renders dashboard table 1`] = `
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </button>
                                   </EuiButtonIcon>
diff --git a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/latency_trend_cell.test.tsx.snap b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/latency_trend_cell.test.tsx.snap
index 4b415df6f9..6c4844fa12 100644
--- a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/latency_trend_cell.test.tsx.snap
+++ b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/latency_trend_cell.test.tsx.snap
@@ -142,7 +142,7 @@ exports[`Latency trend cell component renders latency trend cell 1`] = `
                       size="m"
                       type="magnifyWithPlus"
                     >
-                      <EuiIconEmpty
+                      <EuiIconBeaker
                         aria-hidden={true}
                         className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                         focusable="false"
@@ -159,8 +159,12 @@ exports[`Latency trend cell component renders latency trend cell 1`] = `
                           viewBox="0 0 16 16"
                           width={16}
                           xmlns="http://www.w3.org/2000/svg"
-                        />
-                      </EuiIconEmpty>
+                        >
+                          <path
+                            d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                          />
+                        </svg>
+                      </EuiIconBeaker>
                     </EuiIcon>
                   </button>
                 </EuiButtonIcon>
diff --git a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/mode_picker.test.tsx.snap b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/mode_picker.test.tsx.snap
index 469f17277f..95690a4bae 100644
--- a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/mode_picker.test.tsx.snap
+++ b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/mode_picker.test.tsx.snap
@@ -86,7 +86,7 @@ exports[`Mode picker component renders mode picker 1`] = `
                   size="m"
                   type="arrowDown"
                 >
-                  <EuiIconEmpty
+                  <EuiIconBeaker
                     aria-hidden={true}
                     className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                     focusable="false"
@@ -103,8 +103,12 @@ exports[`Mode picker component renders mode picker 1`] = `
                       viewBox="0 0 16 16"
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
-                    />
-                  </EuiIconEmpty>
+                    >
+                      <path
+                        d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                      />
+                    </svg>
+                  </EuiIconBeaker>
                 </EuiIcon>
                 <span
                   className="euiButtonEmpty__text"
@@ -207,7 +211,7 @@ exports[`Mode picker component renders mode picker 2`] = `
                   size="m"
                   type="arrowDown"
                 >
-                  <EuiIconEmpty
+                  <EuiIconBeaker
                     aria-hidden={true}
                     className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                     focusable="false"
@@ -224,8 +228,12 @@ exports[`Mode picker component renders mode picker 2`] = `
                       viewBox="0 0 16 16"
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
-                    />
-                  </EuiIconEmpty>
+                    >
+                      <path
+                        d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                      />
+                    </svg>
+                  </EuiIconBeaker>
                 </EuiIcon>
                 <span
                   className="euiButtonEmpty__text"
@@ -318,7 +326,11 @@ exports[`Mode picker component renders mode picker 2`] = `
                                   viewBox="0 0 16 16"
                                   width="16"
                                   xmlns="http://www.w3.org/2000/svg"
-                                />
+                                >
+                                  <path
+                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                  />
+                                </svg>
                               </span>
                             </div>
                           </div>
@@ -674,7 +686,7 @@ exports[`Mode picker component renders mode picker 2`] = `
                                                           size="s"
                                                           type="search"
                                                         >
-                                                          <EuiIconEmpty
+                                                          <EuiIconBeaker
                                                             aria-hidden={true}
                                                             className="euiIcon euiIcon--small euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                                             focusable="false"
@@ -691,8 +703,12 @@ exports[`Mode picker component renders mode picker 2`] = `
                                                               viewBox="0 0 16 16"
                                                               width={16}
                                                               xmlns="http://www.w3.org/2000/svg"
-                                                            />
-                                                          </EuiIconEmpty>
+                                                            >
+                                                              <path
+                                                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                              />
+                                                            </svg>
+                                                          </EuiIconBeaker>
                                                         </EuiIcon>
                                                       </span>
                                                     </EuiFormControlLayoutCustomIcon>
diff --git a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/top_error_rates_table.test.tsx.snap b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/top_error_rates_table.test.tsx.snap
index 71733fa84d..dee301c004 100644
--- a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/top_error_rates_table.test.tsx.snap
+++ b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/top_error_rates_table.test.tsx.snap
@@ -805,7 +805,7 @@ exports[`Error Rates Table component renders top error rates table with data 1`]
                                               size="s"
                                               type="arrowDown"
                                             >
-                                              <EuiIconEmpty
+                                              <EuiIconBeaker
                                                 aria-hidden={true}
                                                 className="euiIcon euiIcon--small euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                 focusable="false"
@@ -822,8 +822,12 @@ exports[`Error Rates Table component renders top error rates table with data 1`]
                                                   viewBox="0 0 16 16"
                                                   width={16}
                                                   xmlns="http://www.w3.org/2000/svg"
-                                                />
-                                              </EuiIconEmpty>
+                                                >
+                                                  <path
+                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                  />
+                                                </svg>
+                                              </EuiIconBeaker>
                                             </EuiIcon>
                                             <span
                                               className="euiButtonEmpty__text"
@@ -947,7 +951,7 @@ exports[`Error Rates Table component renders top error rates table with data 1`]
                                                 size="s"
                                                 type="questionInCircle"
                                               >
-                                                <EuiIconEmpty
+                                                <EuiIconBeaker
                                                   aria-hidden={true}
                                                   className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                                   focusable="false"
@@ -964,8 +968,12 @@ exports[`Error Rates Table component renders top error rates table with data 1`]
                                                     viewBox="0 0 16 16"
                                                     width={16}
                                                     xmlns="http://www.w3.org/2000/svg"
-                                                  />
-                                                </EuiIconEmpty>
+                                                  >
+                                                    <path
+                                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                    />
+                                                  </svg>
+                                                </EuiIconBeaker>
                                               </EuiIcon>
                                             </div>
                                             <div>
@@ -1056,7 +1064,7 @@ exports[`Error Rates Table component renders top error rates table with data 1`]
                                                 size="s"
                                                 type="questionInCircle"
                                               >
-                                                <EuiIconEmpty
+                                                <EuiIconBeaker
                                                   aria-hidden={true}
                                                   className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                                   focusable="false"
@@ -1073,8 +1081,12 @@ exports[`Error Rates Table component renders top error rates table with data 1`]
                                                     viewBox="0 0 16 16"
                                                     width={16}
                                                     xmlns="http://www.w3.org/2000/svg"
-                                                  />
-                                                </EuiIconEmpty>
+                                                  >
+                                                    <path
+                                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                    />
+                                                  </svg>
+                                                </EuiIconBeaker>
                                               </EuiIcon>
                                             </div>
                                             <div>
@@ -1154,7 +1166,7 @@ exports[`Error Rates Table component renders top error rates table with data 1`]
                                               size="s"
                                               type="questionInCircle"
                                             >
-                                              <EuiIconEmpty
+                                              <EuiIconBeaker
                                                 aria-hidden={true}
                                                 className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                                 focusable="false"
@@ -1171,8 +1183,12 @@ exports[`Error Rates Table component renders top error rates table with data 1`]
                                                   viewBox="0 0 16 16"
                                                   width={16}
                                                   xmlns="http://www.w3.org/2000/svg"
-                                                />
-                                              </EuiIconEmpty>
+                                                >
+                                                  <path
+                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                  />
+                                                </svg>
+                                              </EuiIconBeaker>
                                             </EuiIcon>
                                           </div>
                                           <div>
@@ -1262,7 +1278,7 @@ exports[`Error Rates Table component renders top error rates table with data 1`]
                                                 size="s"
                                                 type="questionInCircle"
                                               >
-                                                <EuiIconEmpty
+                                                <EuiIconBeaker
                                                   aria-hidden={true}
                                                   className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                                   focusable="false"
@@ -1279,8 +1295,12 @@ exports[`Error Rates Table component renders top error rates table with data 1`]
                                                     viewBox="0 0 16 16"
                                                     width={16}
                                                     xmlns="http://www.w3.org/2000/svg"
-                                                  />
-                                                </EuiIconEmpty>
+                                                  >
+                                                    <path
+                                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                    />
+                                                  </svg>
+                                                </EuiIconBeaker>
                                               </EuiIcon>
                                             </div>
                                             <div>
@@ -1384,7 +1404,7 @@ exports[`Error Rates Table component renders top error rates table with data 1`]
                                         size="s"
                                         type="questionInCircle"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                           focusable="false"
@@ -1401,8 +1421,12 @@ exports[`Error Rates Table component renders top error rates table with data 1`]
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </div>
                                     <div>
@@ -1508,7 +1532,7 @@ exports[`Error Rates Table component renders top error rates table with data 1`]
                                         size="s"
                                         type="questionInCircle"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                           focusable="false"
@@ -1525,8 +1549,12 @@ exports[`Error Rates Table component renders top error rates table with data 1`]
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </div>
                                     <div>
@@ -1617,7 +1645,7 @@ exports[`Error Rates Table component renders top error rates table with data 1`]
                                         size="s"
                                         type="questionInCircle"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                           focusable="false"
@@ -1634,8 +1662,12 @@ exports[`Error Rates Table component renders top error rates table with data 1`]
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </div>
                                     <div>
@@ -1736,7 +1768,7 @@ exports[`Error Rates Table component renders top error rates table with data 1`]
                                         size="s"
                                         type="questionInCircle"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                           focusable="false"
@@ -1753,8 +1785,12 @@ exports[`Error Rates Table component renders top error rates table with data 1`]
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </div>
                                     <div>
@@ -1914,7 +1950,7 @@ exports[`Error Rates Table component renders top error rates table with data 1`]
                                           size="s"
                                           type="arrowDown"
                                         >
-                                          <EuiIconEmpty
+                                          <EuiIconBeaker
                                             aria-hidden={true}
                                             className="euiIcon euiIcon--small euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                             focusable="false"
@@ -1931,8 +1967,12 @@ exports[`Error Rates Table component renders top error rates table with data 1`]
                                               viewBox="0 0 16 16"
                                               width={16}
                                               xmlns="http://www.w3.org/2000/svg"
-                                            />
-                                          </EuiIconEmpty>
+                                            >
+                                              <path
+                                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                              />
+                                            </svg>
+                                          </EuiIconBeaker>
                                         </EuiIcon>
                                         <span
                                           className="euiButtonEmpty__text"
@@ -2006,7 +2046,7 @@ exports[`Error Rates Table component renders top error rates table with data 1`]
                                         size="m"
                                         type="arrowLeft"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                           focusable="false"
@@ -2023,8 +2063,12 @@ exports[`Error Rates Table component renders top error rates table with data 1`]
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </button>
                                   </EuiButtonIcon>
@@ -2153,7 +2197,7 @@ exports[`Error Rates Table component renders top error rates table with data 1`]
                                         size="m"
                                         type="arrowRight"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                           focusable="false"
@@ -2170,8 +2214,12 @@ exports[`Error Rates Table component renders top error rates table with data 1`]
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </button>
                                   </EuiButtonIcon>
diff --git a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/top_latency_table.test.tsx.snap b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/top_latency_table.test.tsx.snap
index d0279c1869..edcc7059d9 100644
--- a/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/top_latency_table.test.tsx.snap
+++ b/public/components/trace_analytics/components/dashboard/__tests__/__snapshots__/top_latency_table.test.tsx.snap
@@ -1164,7 +1164,7 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                               size="s"
                                               type="arrowDown"
                                             >
-                                              <EuiIconEmpty
+                                              <EuiIconBeaker
                                                 aria-hidden={true}
                                                 className="euiIcon euiIcon--small euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                 focusable="false"
@@ -1181,8 +1181,12 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                                   viewBox="0 0 16 16"
                                                   width={16}
                                                   xmlns="http://www.w3.org/2000/svg"
-                                                />
-                                              </EuiIconEmpty>
+                                                >
+                                                  <path
+                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                  />
+                                                </svg>
+                                              </EuiIconBeaker>
                                             </EuiIcon>
                                             <span
                                               className="euiButtonEmpty__text"
@@ -1306,7 +1310,7 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                                 size="s"
                                                 type="questionInCircle"
                                               >
-                                                <EuiIconEmpty
+                                                <EuiIconBeaker
                                                   aria-hidden={true}
                                                   className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                                   focusable="false"
@@ -1323,8 +1327,12 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                                     viewBox="0 0 16 16"
                                                     width={16}
                                                     xmlns="http://www.w3.org/2000/svg"
-                                                  />
-                                                </EuiIconEmpty>
+                                                  >
+                                                    <path
+                                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                    />
+                                                  </svg>
+                                                </EuiIconBeaker>
                                               </EuiIcon>
                                             </div>
                                             <div>
@@ -1421,7 +1429,7 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                                 size="s"
                                                 type="questionInCircle"
                                               >
-                                                <EuiIconEmpty
+                                                <EuiIconBeaker
                                                   aria-hidden={true}
                                                   className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                                   focusable="false"
@@ -1438,8 +1446,12 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                                     viewBox="0 0 16 16"
                                                     width={16}
                                                     xmlns="http://www.w3.org/2000/svg"
-                                                  />
-                                                </EuiIconEmpty>
+                                                  >
+                                                    <path
+                                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                    />
+                                                  </svg>
+                                                </EuiIconBeaker>
                                               </EuiIcon>
                                             </span>
                                           </span>
@@ -1471,7 +1483,7 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                     size="m"
                                     type="sortDown"
                                   >
-                                    <EuiIconEmpty
+                                    <EuiIconBeaker
                                       aria-hidden={true}
                                       className="euiIcon euiIcon--medium euiIcon-isLoading euiTableSortIcon"
                                       focusable="false"
@@ -1488,8 +1500,12 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                         viewBox="0 0 16 16"
                                         width={16}
                                         xmlns="http://www.w3.org/2000/svg"
-                                      />
-                                    </EuiIconEmpty>
+                                      >
+                                        <path
+                                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                        />
+                                      </svg>
+                                    </EuiIconBeaker>
                                   </EuiIcon>
                                 </span>
                               </CellContents>
@@ -1571,7 +1587,7 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                                 size="s"
                                                 type="questionInCircle"
                                               >
-                                                <EuiIconEmpty
+                                                <EuiIconBeaker
                                                   aria-hidden={true}
                                                   className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                                   focusable="false"
@@ -1588,8 +1604,12 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                                     viewBox="0 0 16 16"
                                                     width={16}
                                                     xmlns="http://www.w3.org/2000/svg"
-                                                  />
-                                                </EuiIconEmpty>
+                                                  >
+                                                    <path
+                                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                    />
+                                                  </svg>
+                                                </EuiIconBeaker>
                                               </EuiIcon>
                                             </div>
                                             <div>
@@ -1680,7 +1700,7 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                                 size="s"
                                                 type="questionInCircle"
                                               >
-                                                <EuiIconEmpty
+                                                <EuiIconBeaker
                                                   aria-hidden={true}
                                                   className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                                   focusable="false"
@@ -1697,8 +1717,12 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                                     viewBox="0 0 16 16"
                                                     width={16}
                                                     xmlns="http://www.w3.org/2000/svg"
-                                                  />
-                                                </EuiIconEmpty>
+                                                  >
+                                                    <path
+                                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                    />
+                                                  </svg>
+                                                </EuiIconBeaker>
                                               </EuiIcon>
                                             </div>
                                             <div>
@@ -1789,7 +1813,7 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                                 size="s"
                                                 type="questionInCircle"
                                               >
-                                                <EuiIconEmpty
+                                                <EuiIconBeaker
                                                   aria-hidden={true}
                                                   className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                                   focusable="false"
@@ -1806,8 +1830,12 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                                     viewBox="0 0 16 16"
                                                     width={16}
                                                     xmlns="http://www.w3.org/2000/svg"
-                                                  />
-                                                </EuiIconEmpty>
+                                                  >
+                                                    <path
+                                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                    />
+                                                  </svg>
+                                                </EuiIconBeaker>
                                               </EuiIcon>
                                             </div>
                                             <div>
@@ -1911,7 +1939,7 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                         size="s"
                                         type="questionInCircle"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                           focusable="false"
@@ -1928,8 +1956,12 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </div>
                                     <div>
@@ -2042,7 +2074,7 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                         size="s"
                                         type="questionInCircle"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                           focusable="false"
@@ -2059,8 +2091,12 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </span>
                                   </span>
@@ -2480,7 +2516,7 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                         size="s"
                                         type="questionInCircle"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                           focusable="false"
@@ -2497,8 +2533,12 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </div>
                                     <div>
@@ -2589,7 +2629,7 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                         size="s"
                                         type="questionInCircle"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                           focusable="false"
@@ -2606,8 +2646,12 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </div>
                                     <div>
@@ -2708,7 +2752,7 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                         size="s"
                                         type="questionInCircle"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--small euiIcon--subdued euiIcon-isLoading eui-alignTop"
                                           focusable="false"
@@ -2725,8 +2769,12 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </div>
                                     <div>
@@ -2886,7 +2934,7 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                           size="s"
                                           type="arrowDown"
                                         >
-                                          <EuiIconEmpty
+                                          <EuiIconBeaker
                                             aria-hidden={true}
                                             className="euiIcon euiIcon--small euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                             focusable="false"
@@ -2903,8 +2951,12 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                               viewBox="0 0 16 16"
                                               width={16}
                                               xmlns="http://www.w3.org/2000/svg"
-                                            />
-                                          </EuiIconEmpty>
+                                            >
+                                              <path
+                                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                              />
+                                            </svg>
+                                          </EuiIconBeaker>
                                         </EuiIcon>
                                         <span
                                           className="euiButtonEmpty__text"
@@ -2978,7 +3030,7 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                         size="m"
                                         type="arrowLeft"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                           focusable="false"
@@ -2995,8 +3047,12 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </button>
                                   </EuiButtonIcon>
@@ -3125,7 +3181,7 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                         size="m"
                                         type="arrowRight"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                           focusable="false"
@@ -3142,8 +3198,12 @@ exports[`Latency Table component renders top error rates table with data 1`] = `
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </button>
                                   </EuiButtonIcon>
diff --git a/public/components/trace_analytics/components/services/__tests__/__snapshots__/services.test.tsx.snap b/public/components/trace_analytics/components/services/__tests__/__snapshots__/services.test.tsx.snap
index 042830c076..b4e2ead80a 100644
--- a/public/components/trace_analytics/components/services/__tests__/__snapshots__/services.test.tsx.snap
+++ b/public/components/trace_analytics/components/services/__tests__/__snapshots__/services.test.tsx.snap
@@ -282,7 +282,7 @@ exports[`Services component renders empty services page 1`] = `
                     size="m"
                     type="arrowDown"
                   >
-                    <EuiIconEmpty
+                    <EuiIconBeaker
                       aria-hidden={true}
                       className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                       focusable="false"
@@ -299,8 +299,12 @@ exports[`Services component renders empty services page 1`] = `
                         viewBox="0 0 16 16"
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
-                      />
-                    </EuiIconEmpty>
+                      >
+                        <path
+                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                        />
+                      </svg>
+                    </EuiIconBeaker>
                   </EuiIcon>
                   <span
                     className="euiButtonEmpty__text"
@@ -606,7 +610,7 @@ exports[`Services component renders empty services page 1`] = `
                                 size="m"
                                 type="search"
                               >
-                                <EuiIconEmpty
+                                <EuiIconBeaker
                                   aria-hidden={true}
                                   className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                   focusable="false"
@@ -623,8 +627,12 @@ exports[`Services component renders empty services page 1`] = `
                                     viewBox="0 0 16 16"
                                     width={16}
                                     xmlns="http://www.w3.org/2000/svg"
-                                  />
-                                </EuiIconEmpty>
+                                  >
+                                    <path
+                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                    />
+                                  </svg>
+                                </EuiIconBeaker>
                               </EuiIcon>
                             </span>
                           </EuiFormControlLayoutCustomIcon>
@@ -922,7 +930,7 @@ exports[`Services component renders empty services page 1`] = `
                                               size="s"
                                               type="arrowDown"
                                             >
-                                              <EuiIconEmpty
+                                              <EuiIconBeaker
                                                 aria-hidden={true}
                                                 className="euiIcon euiIcon--small euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                 focusable="false"
@@ -939,8 +947,12 @@ exports[`Services component renders empty services page 1`] = `
                                                   viewBox="0 0 16 16"
                                                   width={16}
                                                   xmlns="http://www.w3.org/2000/svg"
-                                                />
-                                              </EuiIconEmpty>
+                                                >
+                                                  <path
+                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                  />
+                                                </svg>
+                                              </EuiIconBeaker>
                                             </EuiIcon>
                                             <span
                                               className="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
@@ -948,7 +960,7 @@ exports[`Services component renders empty services page 1`] = `
                                               <EuiIcon
                                                 type="calendar"
                                               >
-                                                <EuiIconEmpty
+                                                <EuiIconBeaker
                                                   aria-hidden={true}
                                                   className="euiIcon euiIcon--medium euiIcon-isLoading"
                                                   focusable="false"
@@ -965,8 +977,12 @@ exports[`Services component renders empty services page 1`] = `
                                                     viewBox="0 0 16 16"
                                                     width={16}
                                                     xmlns="http://www.w3.org/2000/svg"
-                                                  />
-                                                </EuiIconEmpty>
+                                                  >
+                                                    <path
+                                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                    />
+                                                  </svg>
+                                                </EuiIconBeaker>
                                               </EuiIcon>
                                             </span>
                                           </span>
@@ -1076,7 +1092,7 @@ exports[`Services component renders empty services page 1`] = `
                           size="m"
                           type="refresh"
                         >
-                          <EuiIconEmpty
+                          <EuiIconBeaker
                             aria-hidden={true}
                             className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                             focusable="false"
@@ -1093,8 +1109,12 @@ exports[`Services component renders empty services page 1`] = `
                               viewBox="0 0 16 16"
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </EuiIconEmpty>
+                            >
+                              <path
+                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                              />
+                            </svg>
+                          </EuiIconBeaker>
                         </EuiIcon>
                         <span
                           className="euiButton__text"
@@ -1211,7 +1231,7 @@ exports[`Services component renders empty services page 1`] = `
                               size="m"
                               type="filter"
                             >
-                              <EuiIconEmpty
+                              <EuiIconBeaker
                                 aria-hidden={true}
                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                 focusable="false"
@@ -1228,8 +1248,12 @@ exports[`Services component renders empty services page 1`] = `
                                   viewBox="0 0 16 16"
                                   width={16}
                                   xmlns="http://www.w3.org/2000/svg"
-                                />
-                              </EuiIconEmpty>
+                                >
+                                  <path
+                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                  />
+                                </svg>
+                              </EuiIconBeaker>
                             </EuiIcon>
                           </button>
                         </EuiButtonIcon>
@@ -1875,7 +1899,7 @@ exports[`Services component renders empty services page 1`] = `
                                     size="m"
                                     type="search"
                                   >
-                                    <EuiIconEmpty
+                                    <EuiIconBeaker
                                       aria-hidden={true}
                                       className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                       focusable="false"
@@ -1892,8 +1916,12 @@ exports[`Services component renders empty services page 1`] = `
                                         viewBox="0 0 16 16"
                                         width={16}
                                         xmlns="http://www.w3.org/2000/svg"
-                                      />
-                                    </EuiIconEmpty>
+                                      >
+                                        <path
+                                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                        />
+                                      </svg>
+                                    </EuiIconBeaker>
                                   </EuiIcon>
                                 </span>
                               </EuiFormControlLayoutCustomIcon>
@@ -2042,7 +2070,7 @@ exports[`Services component renders empty services page 1`] = `
                     size="m"
                     type="arrowRight"
                   >
-                    <EuiIconEmpty
+                    <EuiIconBeaker
                       aria-hidden={true}
                       className="euiIcon euiIcon--medium euiIcon-isLoading euiAccordion__icon"
                       focusable="false"
@@ -2059,8 +2087,12 @@ exports[`Services component renders empty services page 1`] = `
                         viewBox="0 0 16 16"
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
-                      />
-                    </EuiIconEmpty>
+                      >
+                        <path
+                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                        />
+                      </svg>
+                    </EuiIconBeaker>
                   </EuiIcon>
                 </span>
                 <span
diff --git a/public/components/trace_analytics/components/services/__tests__/__snapshots__/services_table.test.tsx.snap b/public/components/trace_analytics/components/services/__tests__/__snapshots__/services_table.test.tsx.snap
index 345418298e..dec933007c 100644
--- a/public/components/trace_analytics/components/services/__tests__/__snapshots__/services_table.test.tsx.snap
+++ b/public/components/trace_analytics/components/services/__tests__/__snapshots__/services_table.test.tsx.snap
@@ -2137,7 +2137,7 @@ exports[`Services table component renders services table 1`] = `
                                               size="s"
                                               type="arrowDown"
                                             >
-                                              <EuiIconEmpty
+                                              <EuiIconBeaker
                                                 aria-hidden={true}
                                                 className="euiIcon euiIcon--small euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                 focusable="false"
@@ -2154,8 +2154,12 @@ exports[`Services table component renders services table 1`] = `
                                                   viewBox="0 0 16 16"
                                                   width={16}
                                                   xmlns="http://www.w3.org/2000/svg"
-                                                />
-                                              </EuiIconEmpty>
+                                                >
+                                                  <path
+                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                  />
+                                                </svg>
+                                              </EuiIconBeaker>
                                             </EuiIcon>
                                             <span
                                               className="euiButtonEmpty__text"
@@ -2264,7 +2268,7 @@ exports[`Services table component renders services table 1`] = `
                                     size="m"
                                     type="sortUp"
                                   >
-                                    <EuiIconEmpty
+                                    <EuiIconBeaker
                                       aria-hidden={true}
                                       className="euiIcon euiIcon--medium euiIcon-isLoading euiTableSortIcon"
                                       focusable="false"
@@ -2281,8 +2285,12 @@ exports[`Services table component renders services table 1`] = `
                                         viewBox="0 0 16 16"
                                         width={16}
                                         xmlns="http://www.w3.org/2000/svg"
-                                      />
-                                    </EuiIconEmpty>
+                                      >
+                                        <path
+                                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                        />
+                                      </svg>
+                                    </EuiIconBeaker>
                                   </EuiIcon>
                                 </span>
                               </CellContents>
@@ -3065,7 +3073,7 @@ exports[`Services table component renders services table 1`] = `
                                           size="s"
                                           type="arrowDown"
                                         >
-                                          <EuiIconEmpty
+                                          <EuiIconBeaker
                                             aria-hidden={true}
                                             className="euiIcon euiIcon--small euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                             focusable="false"
@@ -3082,8 +3090,12 @@ exports[`Services table component renders services table 1`] = `
                                               viewBox="0 0 16 16"
                                               width={16}
                                               xmlns="http://www.w3.org/2000/svg"
-                                            />
-                                          </EuiIconEmpty>
+                                            >
+                                              <path
+                                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                              />
+                                            </svg>
+                                          </EuiIconBeaker>
                                         </EuiIcon>
                                         <span
                                           className="euiButtonEmpty__text"
@@ -3157,7 +3169,7 @@ exports[`Services table component renders services table 1`] = `
                                         size="m"
                                         type="arrowLeft"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                           focusable="false"
@@ -3174,8 +3186,12 @@ exports[`Services table component renders services table 1`] = `
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </button>
                                   </EuiButtonIcon>
@@ -3304,7 +3320,7 @@ exports[`Services table component renders services table 1`] = `
                                         size="m"
                                         type="arrowRight"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                           focusable="false"
@@ -3321,8 +3337,12 @@ exports[`Services table component renders services table 1`] = `
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </button>
                                   </EuiButtonIcon>
diff --git a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/service_breakdown_panel.test.tsx.snap b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/service_breakdown_panel.test.tsx.snap
index db4ecbdadf..9024b9fa83 100644
--- a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/service_breakdown_panel.test.tsx.snap
+++ b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/service_breakdown_panel.test.tsx.snap
@@ -318,7 +318,7 @@ exports[`Service breakdown panel component renders service breakdown panel 1`] =
                                             color="#7492e7"
                                             type="dot"
                                           >
-                                            <EuiIconEmpty
+                                            <EuiIconBeaker
                                               aria-hidden={true}
                                               className="euiIcon euiIcon--medium euiIcon--customColor euiIcon-isLoading"
                                               focusable="false"
@@ -343,8 +343,12 @@ exports[`Service breakdown panel component renders service breakdown panel 1`] =
                                                 viewBox="0 0 16 16"
                                                 width={16}
                                                 xmlns="http://www.w3.org/2000/svg"
-                                              />
-                                            </EuiIconEmpty>
+                                              >
+                                                <path
+                                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                />
+                                              </svg>
+                                            </EuiIconBeaker>
                                           </EuiIcon>
                                         </div>
                                       </EuiFlexItem>
diff --git a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/span_detail_flyout.test.tsx.snap b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/span_detail_flyout.test.tsx.snap
index e4eb22e85d..4f5a9b424e 100644
--- a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/span_detail_flyout.test.tsx.snap
+++ b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/span_detail_flyout.test.tsx.snap
@@ -60,7 +60,11 @@ exports[`<SpanDetailFlyout /> spec renders the empty component 1`] = `
                     viewBox="0 0 16 16"
                     width="16"
                     xmlns="http://www.w3.org/2000/svg"
-                  />
+                  >
+                    <path
+                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                    />
+                  </svg>
                 </button>
                 <div
                   class="euiFlyoutHeader euiFlyoutHeader--hasBorder"
@@ -204,7 +208,11 @@ exports[`<SpanDetailFlyout /> spec renders the empty component 1`] = `
                             viewBox="0 0 16 16"
                             width="16"
                             xmlns="http://www.w3.org/2000/svg"
-                          />
+                          >
+                            <path
+                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                            />
+                          </svg>
                         </button>
                         <div
                           class="euiFlyoutHeader euiFlyoutHeader--hasBorder"
@@ -280,7 +288,11 @@ exports[`<SpanDetailFlyout /> spec renders the empty component 1`] = `
                               viewBox="0 0 16 16"
                               width="16"
                               xmlns="http://www.w3.org/2000/svg"
-                            />
+                            >
+                              <path
+                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                              />
+                            </svg>
                           </button>
                           <div
                             class="euiFlyoutHeader euiFlyoutHeader--hasBorder"
@@ -356,7 +368,11 @@ exports[`<SpanDetailFlyout /> spec renders the empty component 1`] = `
                                 viewBox="0 0 16 16"
                                 width="16"
                                 xmlns="http://www.w3.org/2000/svg"
-                              />
+                              >
+                                <path
+                                  d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                />
+                              </svg>
                             </button>
                             <div
                               class="euiFlyoutHeader euiFlyoutHeader--hasBorder"
@@ -420,7 +436,11 @@ exports[`<SpanDetailFlyout /> spec renders the empty component 1`] = `
                                   viewBox="0 0 16 16"
                                   width="16"
                                   xmlns="http://www.w3.org/2000/svg"
-                                />
+                                >
+                                  <path
+                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                  />
+                                </svg>
                               </button>
                               <div
                                 class="euiFlyoutHeader euiFlyoutHeader--hasBorder"
@@ -520,7 +540,7 @@ exports[`<SpanDetailFlyout /> spec renders the empty component 1`] = `
                                 size="m"
                                 type="cross"
                               >
-                                <EuiIconEmpty
+                                <EuiIconBeaker
                                   aria-hidden={true}
                                   className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                   focusable="false"
@@ -537,8 +557,12 @@ exports[`<SpanDetailFlyout /> spec renders the empty component 1`] = `
                                     viewBox="0 0 16 16"
                                     width={16}
                                     xmlns="http://www.w3.org/2000/svg"
-                                  />
-                                </EuiIconEmpty>
+                                  >
+                                    <path
+                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                    />
+                                  </svg>
+                                </EuiIconBeaker>
                               </EuiIcon>
                             </button>
                           </EuiButtonIcon>
diff --git a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces.test.tsx.snap b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces.test.tsx.snap
index 1be451ac0a..eb5619545b 100644
--- a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces.test.tsx.snap
+++ b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces.test.tsx.snap
@@ -281,7 +281,7 @@ exports[`Traces component renders empty traces page 1`] = `
                     size="m"
                     type="arrowDown"
                   >
-                    <EuiIconEmpty
+                    <EuiIconBeaker
                       aria-hidden={true}
                       className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                       focusable="false"
@@ -298,8 +298,12 @@ exports[`Traces component renders empty traces page 1`] = `
                         viewBox="0 0 16 16"
                         width={16}
                         xmlns="http://www.w3.org/2000/svg"
-                      />
-                    </EuiIconEmpty>
+                      >
+                        <path
+                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                        />
+                      </svg>
+                    </EuiIconBeaker>
                   </EuiIcon>
                   <span
                     className="euiButtonEmpty__text"
@@ -604,7 +608,7 @@ exports[`Traces component renders empty traces page 1`] = `
                                 size="m"
                                 type="search"
                               >
-                                <EuiIconEmpty
+                                <EuiIconBeaker
                                   aria-hidden={true}
                                   className="euiIcon euiIcon--medium euiIcon-isLoading euiFormControlLayoutCustomIcon__icon"
                                   focusable="false"
@@ -621,8 +625,12 @@ exports[`Traces component renders empty traces page 1`] = `
                                     viewBox="0 0 16 16"
                                     width={16}
                                     xmlns="http://www.w3.org/2000/svg"
-                                  />
-                                </EuiIconEmpty>
+                                  >
+                                    <path
+                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                    />
+                                  </svg>
+                                </EuiIconBeaker>
                               </EuiIcon>
                             </span>
                           </EuiFormControlLayoutCustomIcon>
@@ -920,7 +928,7 @@ exports[`Traces component renders empty traces page 1`] = `
                                               size="s"
                                               type="arrowDown"
                                             >
-                                              <EuiIconEmpty
+                                              <EuiIconBeaker
                                                 aria-hidden={true}
                                                 className="euiIcon euiIcon--small euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                 focusable="false"
@@ -937,8 +945,12 @@ exports[`Traces component renders empty traces page 1`] = `
                                                   viewBox="0 0 16 16"
                                                   width={16}
                                                   xmlns="http://www.w3.org/2000/svg"
-                                                />
-                                              </EuiIconEmpty>
+                                                >
+                                                  <path
+                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                  />
+                                                </svg>
+                                              </EuiIconBeaker>
                                             </EuiIcon>
                                             <span
                                               className="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
@@ -946,7 +958,7 @@ exports[`Traces component renders empty traces page 1`] = `
                                               <EuiIcon
                                                 type="calendar"
                                               >
-                                                <EuiIconEmpty
+                                                <EuiIconBeaker
                                                   aria-hidden={true}
                                                   className="euiIcon euiIcon--medium euiIcon-isLoading"
                                                   focusable="false"
@@ -963,8 +975,12 @@ exports[`Traces component renders empty traces page 1`] = `
                                                     viewBox="0 0 16 16"
                                                     width={16}
                                                     xmlns="http://www.w3.org/2000/svg"
-                                                  />
-                                                </EuiIconEmpty>
+                                                  >
+                                                    <path
+                                                      d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                    />
+                                                  </svg>
+                                                </EuiIconBeaker>
                                               </EuiIcon>
                                             </span>
                                           </span>
@@ -1074,7 +1090,7 @@ exports[`Traces component renders empty traces page 1`] = `
                           size="m"
                           type="refresh"
                         >
-                          <EuiIconEmpty
+                          <EuiIconBeaker
                             aria-hidden={true}
                             className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                             focusable="false"
@@ -1091,8 +1107,12 @@ exports[`Traces component renders empty traces page 1`] = `
                               viewBox="0 0 16 16"
                               width={16}
                               xmlns="http://www.w3.org/2000/svg"
-                            />
-                          </EuiIconEmpty>
+                            >
+                              <path
+                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                              />
+                            </svg>
+                          </EuiIconBeaker>
                         </EuiIcon>
                         <span
                           className="euiButton__text"
@@ -1209,7 +1229,7 @@ exports[`Traces component renders empty traces page 1`] = `
                               size="m"
                               type="filter"
                             >
-                              <EuiIconEmpty
+                              <EuiIconBeaker
                                 aria-hidden={true}
                                 className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                 focusable="false"
@@ -1226,8 +1246,12 @@ exports[`Traces component renders empty traces page 1`] = `
                                   viewBox="0 0 16 16"
                                   width={16}
                                   xmlns="http://www.w3.org/2000/svg"
-                                />
-                              </EuiIconEmpty>
+                                >
+                                  <path
+                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                  />
+                                </svg>
+                              </EuiIconBeaker>
                             </EuiIcon>
                           </button>
                         </EuiButtonIcon>
diff --git a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces_table.test.tsx.snap b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces_table.test.tsx.snap
index 43f7391229..0662d5db1e 100644
--- a/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces_table.test.tsx.snap
+++ b/public/components/trace_analytics/components/traces/__tests__/__snapshots__/traces_table.test.tsx.snap
@@ -187,7 +187,7 @@ exports[`Traces table component renders empty traces table message 1`] = `
                         size="m"
                         type="popout"
                       >
-                        <EuiIconEmpty
+                        <EuiIconBeaker
                           aria-hidden={true}
                           className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                           focusable="false"
@@ -204,8 +204,12 @@ exports[`Traces table component renders empty traces table message 1`] = `
                             viewBox="0 0 16 16"
                             width={16}
                             xmlns="http://www.w3.org/2000/svg"
-                          />
-                        </EuiIconEmpty>
+                          >
+                            <path
+                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                            />
+                          </svg>
+                        </EuiIconBeaker>
                       </EuiIcon>
                       <span
                         className="euiButton__text"
@@ -2154,7 +2158,7 @@ exports[`Traces table component renders traces table 1`] = `
                                               size="s"
                                               type="arrowDown"
                                             >
-                                              <EuiIconEmpty
+                                              <EuiIconBeaker
                                                 aria-hidden={true}
                                                 className="euiIcon euiIcon--small euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                                 focusable="false"
@@ -2171,8 +2175,12 @@ exports[`Traces table component renders traces table 1`] = `
                                                   viewBox="0 0 16 16"
                                                   width={16}
                                                   xmlns="http://www.w3.org/2000/svg"
-                                                />
-                                              </EuiIconEmpty>
+                                                >
+                                                  <path
+                                                    d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                  />
+                                                </svg>
+                                              </EuiIconBeaker>
                                             </EuiIcon>
                                             <span
                                               className="euiButtonEmpty__text"
@@ -2281,7 +2289,7 @@ exports[`Traces table component renders traces table 1`] = `
                                     size="m"
                                     type="sortUp"
                                   >
-                                    <EuiIconEmpty
+                                    <EuiIconBeaker
                                       aria-hidden={true}
                                       className="euiIcon euiIcon--medium euiIcon-isLoading euiTableSortIcon"
                                       focusable="false"
@@ -2298,8 +2306,12 @@ exports[`Traces table component renders traces table 1`] = `
                                         viewBox="0 0 16 16"
                                         width={16}
                                         xmlns="http://www.w3.org/2000/svg"
-                                      />
-                                    </EuiIconEmpty>
+                                      >
+                                        <path
+                                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                        />
+                                      </svg>
+                                    </EuiIconBeaker>
                                   </EuiIcon>
                                 </span>
                               </CellContents>
@@ -2719,7 +2731,7 @@ exports[`Traces table component renders traces table 1`] = `
                                                     size="m"
                                                     type="copyClipboard"
                                                   >
-                                                    <EuiIconEmpty
+                                                    <EuiIconBeaker
                                                       aria-hidden={true}
                                                       className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                                       focusable="false"
@@ -2736,8 +2748,12 @@ exports[`Traces table component renders traces table 1`] = `
                                                         viewBox="0 0 16 16"
                                                         width={16}
                                                         xmlns="http://www.w3.org/2000/svg"
-                                                      />
-                                                    </EuiIconEmpty>
+                                                      >
+                                                        <path
+                                                          d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                                        />
+                                                      </svg>
+                                                    </EuiIconBeaker>
                                                   </EuiIcon>
                                                 </button>
                                               </EuiButtonIcon>
@@ -3079,7 +3095,7 @@ exports[`Traces table component renders traces table 1`] = `
                                           size="s"
                                           type="arrowDown"
                                         >
-                                          <EuiIconEmpty
+                                          <EuiIconBeaker
                                             aria-hidden={true}
                                             className="euiIcon euiIcon--small euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
                                             focusable="false"
@@ -3096,8 +3112,12 @@ exports[`Traces table component renders traces table 1`] = `
                                               viewBox="0 0 16 16"
                                               width={16}
                                               xmlns="http://www.w3.org/2000/svg"
-                                            />
-                                          </EuiIconEmpty>
+                                            >
+                                              <path
+                                                d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                              />
+                                            </svg>
+                                          </EuiIconBeaker>
                                         </EuiIcon>
                                         <span
                                           className="euiButtonEmpty__text"
@@ -3171,7 +3191,7 @@ exports[`Traces table component renders traces table 1`] = `
                                         size="m"
                                         type="arrowLeft"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                           focusable="false"
@@ -3188,8 +3208,12 @@ exports[`Traces table component renders traces table 1`] = `
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </button>
                                   </EuiButtonIcon>
@@ -3318,7 +3342,7 @@ exports[`Traces table component renders traces table 1`] = `
                                         size="m"
                                         type="arrowRight"
                                       >
-                                        <EuiIconEmpty
+                                        <EuiIconBeaker
                                           aria-hidden={true}
                                           className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
                                           focusable="false"
@@ -3335,8 +3359,12 @@ exports[`Traces table component renders traces table 1`] = `
                                             viewBox="0 0 16 16"
                                             width={16}
                                             xmlns="http://www.w3.org/2000/svg"
-                                          />
-                                        </EuiIconEmpty>
+                                          >
+                                            <path
+                                              d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                                            />
+                                          </svg>
+                                        </EuiIconBeaker>
                                       </EuiIcon>
                                     </button>
                                   </EuiButtonIcon>
diff --git a/public/components/visualizations/charts/__tests__/__snapshots__/gauge.test.tsx.snap b/public/components/visualizations/charts/__tests__/__snapshots__/gauge.test.tsx.snap
index 10c63f396a..6c6d9253e7 100644
--- a/public/components/visualizations/charts/__tests__/__snapshots__/gauge.test.tsx.snap
+++ b/public/components/visualizations/charts/__tests__/__snapshots__/gauge.test.tsx.snap
@@ -567,7 +567,7 @@ exports[`Gauge component Renders gauge component 1`] = `
                   size="xxl"
                   type="visGauge"
                 >
-                  <EuiIconEmpty
+                  <EuiIconBeaker
                     aria-hidden={true}
                     className="euiIcon euiIcon--xxLarge euiIcon--subdued euiIcon-isLoading"
                     focusable="false"
@@ -584,8 +584,12 @@ exports[`Gauge component Renders gauge component 1`] = `
                       viewBox="0 0 16 16"
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
-                    />
-                  </EuiIconEmpty>
+                    >
+                      <path
+                        d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                      />
+                    </svg>
+                  </EuiIconBeaker>
                 </EuiIcon>
                 <EuiSpacer
                   size="l"
diff --git a/public/components/visualizations/charts/__tests__/__snapshots__/metrics.test.tsx.snap b/public/components/visualizations/charts/__tests__/__snapshots__/metrics.test.tsx.snap
index a95c6602b7..a0b9af8445 100644
--- a/public/components/visualizations/charts/__tests__/__snapshots__/metrics.test.tsx.snap
+++ b/public/components/visualizations/charts/__tests__/__snapshots__/metrics.test.tsx.snap
@@ -691,7 +691,7 @@ exports[`Metrics component Renders Metrics component 1`] = `
                   size="xxl"
                   type="stats"
                 >
-                  <EuiIconEmpty
+                  <EuiIconBeaker
                     aria-hidden={true}
                     className="euiIcon euiIcon--xxLarge euiIcon--subdued euiIcon-isLoading"
                     focusable="false"
@@ -708,8 +708,12 @@ exports[`Metrics component Renders Metrics component 1`] = `
                       viewBox="0 0 16 16"
                       width={16}
                       xmlns="http://www.w3.org/2000/svg"
-                    />
-                  </EuiIconEmpty>
+                    >
+                      <path
+                        d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
+                      />
+                    </svg>
+                  </EuiIconBeaker>
                 </EuiIcon>
                 <EuiSpacer
                   size="l"
diff --git a/public/components/visualizations/charts/__tests__/__snapshots__/text.test.tsx.snap b/public/components/visualizations/charts/__tests__/__snapshots__/text.test.tsx.snap
index 66fd31ddf8..e070a4ddeb 100644
--- a/public/components/visualizations/charts/__tests__/__snapshots__/text.test.tsx.snap
+++ b/public/components/visualizations/charts/__tests__/__snapshots__/text.test.tsx.snap
@@ -672,6 +672,7 @@ exports[`Text component Renders text component 1`] = `
       >
         <div>
           <h2
+            id="text"
             key="h-2"
           >
             Text