diff --git a/packages/shared-ux/card/no_data/impl/src/__snapshots__/no_data_card.component.test.tsx.snap b/packages/shared-ux/card/no_data/impl/src/__snapshots__/no_data_card.component.test.tsx.snap
index 17eb4ef8804c..a74b8433433c 100644
--- a/packages/shared-ux/card/no_data/impl/src/__snapshots__/no_data_card.component.test.tsx.snap
+++ b/packages/shared-ux/card/no_data/impl/src/__snapshots__/no_data_card.component.test.tsx.snap
@@ -11,7 +11,9 @@ exports[`NoDataCardComponent props button 1`] = `
   description="Use Elastic Agent for a simple, unified way to collect data from your machines."
   footer={
     <EuiButton
+      color="primary"
       fill={true}
+      size="m"
     >
       Button
     </EuiButton>
@@ -40,7 +42,9 @@ exports[`NoDataCardComponent props href 1`] = `
   description="Use Elastic Agent for a simple, unified way to collect data from your machines."
   footer={
     <EuiButton
+      color="primary"
       fill={true}
+      size="m"
     >
       Add Elastic Agent
     </EuiButton>
@@ -70,7 +74,9 @@ exports[`NoDataCardComponent renders 1`] = `
   description="Use Elastic Agent for a simple, unified way to collect data from your machines."
   footer={
     <EuiButton
+      color="primary"
       fill={true}
+      size="m"
     >
       Add Elastic Agent
     </EuiButton>
diff --git a/src/plugins/dashboard/public/application/listing/__snapshots__/dashboard_listing.test.tsx.snap b/src/plugins/dashboard/public/application/listing/__snapshots__/dashboard_listing.test.tsx.snap
index 6fac25e51ddf..b16dd6e178a7 100644
--- a/src/plugins/dashboard/public/application/listing/__snapshots__/dashboard_listing.test.tsx.snap
+++ b/src/plugins/dashboard/public/application/listing/__snapshots__/dashboard_listing.test.tsx.snap
@@ -29,10 +29,12 @@ exports[`after fetch When given a title that matches multiple dashboards, filter
       <EuiEmptyPrompt
         actions={
           <EuiButton
+            color="primary"
             data-test-subj="newItemButton"
             fill={true}
             iconType="plusInCircle"
             onClick={[Function]}
+            size="m"
           >
             Create a dashboard
           </EuiButton>
@@ -122,10 +124,12 @@ exports[`after fetch initialFilter 1`] = `
       <EuiEmptyPrompt
         actions={
           <EuiButton
+            color="primary"
             data-test-subj="newItemButton"
             fill={true}
             iconType="plusInCircle"
             onClick={[Function]}
+            size="m"
           >
             Create a dashboard
           </EuiButton>
@@ -214,10 +218,12 @@ exports[`after fetch renders all table rows 1`] = `
       <EuiEmptyPrompt
         actions={
           <EuiButton
+            color="primary"
             data-test-subj="newItemButton"
             fill={true}
             iconType="plusInCircle"
             onClick={[Function]}
+            size="m"
           >
             Create a dashboard
           </EuiButton>
@@ -306,10 +312,12 @@ exports[`after fetch renders call to action when no dashboards exist 1`] = `
       <EuiEmptyPrompt
         actions={
           <EuiButton
+            color="primary"
             data-test-subj="newItemButton"
             fill={true}
             iconType="plusInCircle"
             onClick={[Function]}
+            size="m"
           >
             Create a dashboard
           </EuiButton>
@@ -426,6 +434,7 @@ exports[`after fetch renders call to action with continue when no dashboards exi
                 fill={true}
                 iconType="pencil"
                 onClick={[Function]}
+                size="m"
               >
                 Continue editing
               </EuiButton>
diff --git a/src/plugins/dashboard/public/application/top_nav/__snapshots__/clone_modal.test.js.snap b/src/plugins/dashboard/public/application/top_nav/__snapshots__/clone_modal.test.js.snap
index 1e029e6960cd..6c00faa6546d 100644
--- a/src/plugins/dashboard/public/application/top_nav/__snapshots__/clone_modal.test.js.snap
+++ b/src/plugins/dashboard/public/application/top_nav/__snapshots__/clone_modal.test.js.snap
@@ -47,10 +47,12 @@ exports[`renders DashboardCloneModal 1`] = `
       />
     </EuiButtonEmpty>
     <EuiButton
+      color="primary"
       data-test-subj="cloneConfirmButton"
       fill={true}
       isLoading={false}
       onClick={[Function]}
+      size="m"
     >
       <FormattedMessage
         defaultMessage="Confirm Clone"
diff --git a/src/plugins/discover/public/components/discover_grid/get_render_cell_value.test.tsx b/src/plugins/discover/public/components/discover_grid/get_render_cell_value.test.tsx
index a8e1486ba2ff..a932d2689059 100644
--- a/src/plugins/discover/public/components/discover_grid/get_render_cell_value.test.tsx
+++ b/src/plugins/discover/public/components/discover_grid/get_render_cell_value.test.tsx
@@ -120,7 +120,7 @@ describe('Discover grid cell rendering', function () {
       />
     );
     expect(component.html()).toMatchInlineSnapshot(
-      `"<div class=\\"euiFlexGroup euiFlexGroup--directionRow\\"><div class=\\"euiFlexItem\\"><span class=\\"dscDiscoverGrid__cellPopoverValue eui-textBreakWord\\">100</span></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" aria-label=\\"Close popover\\" data-test-subj=\\"docTableClosePopover\\"><span data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button></div></div>"`
+      `"<div class=\\"euiFlexGroup euiFlexGroup--directionRow\\"><div class=\\"euiFlexItem\\"><span class=\\"dscDiscoverGrid__cellPopoverValue eui-textBreakWord\\">100</span></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonIcon euiButtonIcon--xSmall css-1q7ycil-euiButtonIcon-empty-primary-hoverStyles\\" type=\\"button\\" aria-label=\\"Close popover\\" data-test-subj=\\"docTableClosePopover\\"><span data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button></div></div>"`
     );
   });
 
@@ -146,7 +146,7 @@ describe('Discover grid cell rendering', function () {
       />
     );
     expect(component.html()).toMatchInlineSnapshot(
-      `"<div class=\\"euiFlexGroup euiFlexGroup--directionRow\\"><div class=\\"euiFlexItem\\"><span class=\\"dscDiscoverGrid__cellPopoverValue eui-textBreakWord\\">100</span></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" aria-label=\\"Close popover\\" data-test-subj=\\"docTableClosePopover\\"><span data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button></div></div>"`
+      `"<div class=\\"euiFlexGroup euiFlexGroup--directionRow\\"><div class=\\"euiFlexItem\\"><span class=\\"dscDiscoverGrid__cellPopoverValue eui-textBreakWord\\">100</span></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonIcon euiButtonIcon--xSmall css-1q7ycil-euiButtonIcon-empty-primary-hoverStyles\\" type=\\"button\\" aria-label=\\"Close popover\\" data-test-subj=\\"docTableClosePopover\\"><span data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button></div></div>"`
     );
     findTestSubject(component, 'docTableClosePopover').simulate('click');
     expect(closePopoverMockFn).toHaveBeenCalledTimes(1);
diff --git a/src/plugins/discover/public/components/doc_table/components/table_header/__snapshots__/table_header.test.tsx.snap b/src/plugins/discover/public/components/doc_table/components/table_header/__snapshots__/table_header.test.tsx.snap
index 39f52a52138d..cf539f43b39f 100644
--- a/src/plugins/discover/public/components/doc_table/components/table_header/__snapshots__/table_header.test.tsx.snap
+++ b/src/plugins/discover/public/components/doc_table/components/table_header/__snapshots__/table_header.test.tsx.snap
@@ -17,7 +17,7 @@ exports[`TableHeader with time column renders correctly 1`] = `
     >
       time
       <span
-        class="euiToolTipAnchor"
+        class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
       >
         <span
           data-euiicon-type="clock"
@@ -27,11 +27,11 @@ exports[`TableHeader with time column renders correctly 1`] = `
         </span>
       </span>
       <span
-        class="euiToolTipAnchor"
+        class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
       >
         <button
           aria-label="Sort time descending"
-          class="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--xSmall"
+          class="euiButtonIcon euiButtonIcon--xSmall emotion-euiButtonIcon-empty-primary-hoverStyles"
           data-test-subj="docTableHeaderFieldSort_time"
           style="width: 12px; height: 12px;"
           type="button"
@@ -55,11 +55,11 @@ exports[`TableHeader with time column renders correctly 1`] = `
     >
       first
       <span
-        class="euiToolTipAnchor"
+        class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
       >
         <button
           aria-label="Remove first column"
-          class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall kbnDocTableHeader__move"
+          class="euiButtonIcon euiButtonIcon--xSmall kbnDocTableHeader__move emotion-euiButtonIcon-empty-text-hoverStyles"
           data-test-subj="docTableRemoveHeader-first"
           style="width: 12px; height: 12px;"
           type="button"
@@ -73,11 +73,11 @@ exports[`TableHeader with time column renders correctly 1`] = `
         </button>
       </span>
       <span
-        class="euiToolTipAnchor"
+        class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
       >
         <button
           aria-label="Move first column to the right"
-          class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall kbnDocTableHeader__move"
+          class="euiButtonIcon euiButtonIcon--xSmall kbnDocTableHeader__move emotion-euiButtonIcon-empty-text-hoverStyles"
           data-test-subj="docTableMoveRightHeader-first"
           style="width: 12px; height: 12px;"
           type="button"
@@ -101,11 +101,11 @@ exports[`TableHeader with time column renders correctly 1`] = `
     >
       middle
       <span
-        class="euiToolTipAnchor"
+        class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
       >
         <button
           aria-label="Remove middle column"
-          class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall kbnDocTableHeader__move"
+          class="euiButtonIcon euiButtonIcon--xSmall kbnDocTableHeader__move emotion-euiButtonIcon-empty-text-hoverStyles"
           data-test-subj="docTableRemoveHeader-middle"
           style="width: 12px; height: 12px;"
           type="button"
@@ -119,11 +119,11 @@ exports[`TableHeader with time column renders correctly 1`] = `
         </button>
       </span>
       <span
-        class="euiToolTipAnchor"
+        class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
       >
         <button
           aria-label="Move middle column to the left"
-          class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall kbnDocTableHeader__move"
+          class="euiButtonIcon euiButtonIcon--xSmall kbnDocTableHeader__move emotion-euiButtonIcon-empty-text-hoverStyles"
           data-test-subj="docTableMoveLeftHeader-middle"
           style="width: 12px; height: 12px;"
           type="button"
@@ -137,11 +137,11 @@ exports[`TableHeader with time column renders correctly 1`] = `
         </button>
       </span>
       <span
-        class="euiToolTipAnchor"
+        class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
       >
         <button
           aria-label="Move middle column to the right"
-          class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall kbnDocTableHeader__move"
+          class="euiButtonIcon euiButtonIcon--xSmall kbnDocTableHeader__move emotion-euiButtonIcon-empty-text-hoverStyles"
           data-test-subj="docTableMoveRightHeader-middle"
           style="width: 12px; height: 12px;"
           type="button"
@@ -165,11 +165,11 @@ exports[`TableHeader with time column renders correctly 1`] = `
     >
       last
       <span
-        class="euiToolTipAnchor"
+        class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
       >
         <button
           aria-label="Remove last column"
-          class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall kbnDocTableHeader__move"
+          class="euiButtonIcon euiButtonIcon--xSmall kbnDocTableHeader__move emotion-euiButtonIcon-empty-text-hoverStyles"
           data-test-subj="docTableRemoveHeader-last"
           style="width: 12px; height: 12px;"
           type="button"
@@ -183,11 +183,11 @@ exports[`TableHeader with time column renders correctly 1`] = `
         </button>
       </span>
       <span
-        class="euiToolTipAnchor"
+        class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
       >
         <button
           aria-label="Move last column to the left"
-          class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall kbnDocTableHeader__move"
+          class="euiButtonIcon euiButtonIcon--xSmall kbnDocTableHeader__move emotion-euiButtonIcon-empty-text-hoverStyles"
           data-test-subj="docTableMoveLeftHeader-last"
           style="width: 12px; height: 12px;"
           type="button"
@@ -222,11 +222,11 @@ exports[`TableHeader without time column renders correctly 1`] = `
     >
       first
       <span
-        class="euiToolTipAnchor"
+        class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
       >
         <button
           aria-label="Remove first column"
-          class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall kbnDocTableHeader__move"
+          class="euiButtonIcon euiButtonIcon--xSmall kbnDocTableHeader__move emotion-euiButtonIcon-empty-text-hoverStyles"
           data-test-subj="docTableRemoveHeader-first"
           style="width: 12px; height: 12px;"
           type="button"
@@ -240,11 +240,11 @@ exports[`TableHeader without time column renders correctly 1`] = `
         </button>
       </span>
       <span
-        class="euiToolTipAnchor"
+        class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
       >
         <button
           aria-label="Move first column to the right"
-          class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall kbnDocTableHeader__move"
+          class="euiButtonIcon euiButtonIcon--xSmall kbnDocTableHeader__move emotion-euiButtonIcon-empty-text-hoverStyles"
           data-test-subj="docTableMoveRightHeader-first"
           style="width: 12px; height: 12px;"
           type="button"
@@ -268,11 +268,11 @@ exports[`TableHeader without time column renders correctly 1`] = `
     >
       middle
       <span
-        class="euiToolTipAnchor"
+        class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
       >
         <button
           aria-label="Remove middle column"
-          class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall kbnDocTableHeader__move"
+          class="euiButtonIcon euiButtonIcon--xSmall kbnDocTableHeader__move emotion-euiButtonIcon-empty-text-hoverStyles"
           data-test-subj="docTableRemoveHeader-middle"
           style="width: 12px; height: 12px;"
           type="button"
@@ -286,11 +286,11 @@ exports[`TableHeader without time column renders correctly 1`] = `
         </button>
       </span>
       <span
-        class="euiToolTipAnchor"
+        class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
       >
         <button
           aria-label="Move middle column to the left"
-          class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall kbnDocTableHeader__move"
+          class="euiButtonIcon euiButtonIcon--xSmall kbnDocTableHeader__move emotion-euiButtonIcon-empty-text-hoverStyles"
           data-test-subj="docTableMoveLeftHeader-middle"
           style="width: 12px; height: 12px;"
           type="button"
@@ -304,11 +304,11 @@ exports[`TableHeader without time column renders correctly 1`] = `
         </button>
       </span>
       <span
-        class="euiToolTipAnchor"
+        class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
       >
         <button
           aria-label="Move middle column to the right"
-          class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall kbnDocTableHeader__move"
+          class="euiButtonIcon euiButtonIcon--xSmall kbnDocTableHeader__move emotion-euiButtonIcon-empty-text-hoverStyles"
           data-test-subj="docTableMoveRightHeader-middle"
           style="width: 12px; height: 12px;"
           type="button"
@@ -332,11 +332,11 @@ exports[`TableHeader without time column renders correctly 1`] = `
     >
       last
       <span
-        class="euiToolTipAnchor"
+        class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
       >
         <button
           aria-label="Remove last column"
-          class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall kbnDocTableHeader__move"
+          class="euiButtonIcon euiButtonIcon--xSmall kbnDocTableHeader__move emotion-euiButtonIcon-empty-text-hoverStyles"
           data-test-subj="docTableRemoveHeader-last"
           style="width: 12px; height: 12px;"
           type="button"
@@ -350,11 +350,11 @@ exports[`TableHeader without time column renders correctly 1`] = `
         </button>
       </span>
       <span
-        class="euiToolTipAnchor"
+        class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
       >
         <button
           aria-label="Move last column to the left"
-          class="euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall kbnDocTableHeader__move"
+          class="euiButtonIcon euiButtonIcon--xSmall kbnDocTableHeader__move emotion-euiButtonIcon-empty-text-hoverStyles"
           data-test-subj="docTableMoveLeftHeader-last"
           style="width: 12px; height: 12px;"
           type="button"
diff --git a/src/plugins/discover/public/components/doc_table/components/table_row/__snapshots__/table_cell.test.tsx.snap b/src/plugins/discover/public/components/doc_table/components/table_row/__snapshots__/table_cell.test.tsx.snap
index 7f7a63bf139b..555be566a508 100644
--- a/src/plugins/discover/public/components/doc_table/components/table_row/__snapshots__/table_cell.test.tsx.snap
+++ b/src/plugins/discover/public/components/doc_table/components/table_row/__snapshots__/table_cell.test.tsx.snap
@@ -34,32 +34,122 @@ exports[`Doc table cell component renders a cell with filter buttons if it is fi
           display="inlineBlock"
           position="bottom"
         >
-          <span
-            className="euiToolTipAnchor"
+          <EuiToolTipAnchor
+            display="inlineBlock"
+            id="generated-id"
+            isVisible={false}
+            onBlur={[Function]}
+            onFocus={[Function]}
             onMouseOut={[Function]}
             onMouseOver={[Function]}
           >
-            <button
-              aria-label="Filter for value"
-              className="kbnDocTableRowFilterButton"
-              data-test-subj="docTableCellFilter"
-              onBlur={[Function]}
-              onClick={[Function]}
-              onFocus={[Function]}
+            <span
+              css="unknown styles"
+              onMouseOut={[Function]}
+              onMouseOver={[Function]}
             >
-              <EuiIcon
-                color="primary"
-                size="s"
-                type="plusInCircle"
+              <Insertion
+                cache={
+                  Object {
+                    "insert": [Function],
+                    "inserted": Object {
+                      "jcaat8-euiToolTipAnchor-inlineBlock": true,
+                    },
+                    "key": "css",
+                    "nonce": undefined,
+                    "registered": Object {},
+                    "sheet": StyleSheet {
+                      "_alreadyInsertedOrderInsensitiveRule": true,
+                      "_insertTag": [Function],
+                      "before": null,
+                      "container": <head>
+                        <style
+                          data-styled="active"
+                          data-styled-version="5.1.0"
+                        />
+                        <style
+                          data-styled="active"
+                          data-styled-version="5.1.0"
+                        />
+                        <style
+                          data-emotion="css"
+                          data-s=""
+                        >
+                          
+                          .emotion-euiToolTipAnchor-inlineBlock{display:inline-block;}
+                        </style>
+                        <style
+                          data-emotion="css"
+                          data-s=""
+                        >
+                          
+                          .emotion-euiToolTipAnchor-inlineBlock *[disabled]{pointer-events:none;}
+                        </style>
+                      </head>,
+                      "ctr": 2,
+                      "insertionPoint": undefined,
+                      "isSpeedy": false,
+                      "key": "css",
+                      "nonce": undefined,
+                      "prepend": undefined,
+                      "tags": Array [
+                        <style
+                          data-emotion="css"
+                          data-s=""
+                        >
+                          
+                          .emotion-euiToolTipAnchor-inlineBlock{display:inline-block;}
+                        </style>,
+                        <style
+                          data-emotion="css"
+                          data-s=""
+                        >
+                          
+                          .emotion-euiToolTipAnchor-inlineBlock *[disabled]{pointer-events:none;}
+                        </style>,
+                      ],
+                    },
+                  }
+                }
+                isStringTag={true}
+                serialized={
+                  Object {
+                    "map": undefined,
+                    "name": "jcaat8-euiToolTipAnchor-inlineBlock",
+                    "next": undefined,
+                    "styles": "*[disabled]{pointer-events:none;};label:euiToolTipAnchor;;;display:inline-block;label:inlineBlock;;;",
+                    "toString": [Function],
+                  }
+                }
+              />
+              <span
+                className="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
+                onMouseOut={[Function]}
+                onMouseOver={[Function]}
               >
-                <span
-                  color="primary"
-                  data-euiicon-type="plusInCircle"
-                  size="s"
-                />
-              </EuiIcon>
-            </button>
-          </span>
+                <button
+                  aria-label="Filter for value"
+                  className="kbnDocTableRowFilterButton"
+                  data-test-subj="docTableCellFilter"
+                  onBlur={[Function]}
+                  onClick={[Function]}
+                  onFocus={[Function]}
+                >
+                  <EuiIcon
+                    color="primary"
+                    size="s"
+                    type="plusInCircle"
+                  >
+                    <span
+                      color="primary"
+                      data-euiicon-type="plusInCircle"
+                      size="s"
+                    />
+                  </EuiIcon>
+                </button>
+              </span>
+            </span>
+          </EuiToolTipAnchor>
         </EuiToolTip>
         <EuiToolTip
           className="kbnDocTableCell__filterButton"
@@ -68,32 +158,122 @@ exports[`Doc table cell component renders a cell with filter buttons if it is fi
           display="inlineBlock"
           position="bottom"
         >
-          <span
-            className="euiToolTipAnchor"
+          <EuiToolTipAnchor
+            display="inlineBlock"
+            id="generated-id"
+            isVisible={false}
+            onBlur={[Function]}
+            onFocus={[Function]}
             onMouseOut={[Function]}
             onMouseOver={[Function]}
           >
-            <button
-              aria-label="Filter out value"
-              className="kbnDocTableRowFilterButton"
-              data-test-subj="docTableCellFilterNegate"
-              onBlur={[Function]}
-              onClick={[Function]}
-              onFocus={[Function]}
+            <span
+              css="unknown styles"
+              onMouseOut={[Function]}
+              onMouseOver={[Function]}
             >
-              <EuiIcon
-                color="primary"
-                size="s"
-                type="minusInCircle"
+              <Insertion
+                cache={
+                  Object {
+                    "insert": [Function],
+                    "inserted": Object {
+                      "jcaat8-euiToolTipAnchor-inlineBlock": true,
+                    },
+                    "key": "css",
+                    "nonce": undefined,
+                    "registered": Object {},
+                    "sheet": StyleSheet {
+                      "_alreadyInsertedOrderInsensitiveRule": true,
+                      "_insertTag": [Function],
+                      "before": null,
+                      "container": <head>
+                        <style
+                          data-styled="active"
+                          data-styled-version="5.1.0"
+                        />
+                        <style
+                          data-styled="active"
+                          data-styled-version="5.1.0"
+                        />
+                        <style
+                          data-emotion="css"
+                          data-s=""
+                        >
+                          
+                          .emotion-euiToolTipAnchor-inlineBlock{display:inline-block;}
+                        </style>
+                        <style
+                          data-emotion="css"
+                          data-s=""
+                        >
+                          
+                          .emotion-euiToolTipAnchor-inlineBlock *[disabled]{pointer-events:none;}
+                        </style>
+                      </head>,
+                      "ctr": 2,
+                      "insertionPoint": undefined,
+                      "isSpeedy": false,
+                      "key": "css",
+                      "nonce": undefined,
+                      "prepend": undefined,
+                      "tags": Array [
+                        <style
+                          data-emotion="css"
+                          data-s=""
+                        >
+                          
+                          .emotion-euiToolTipAnchor-inlineBlock{display:inline-block;}
+                        </style>,
+                        <style
+                          data-emotion="css"
+                          data-s=""
+                        >
+                          
+                          .emotion-euiToolTipAnchor-inlineBlock *[disabled]{pointer-events:none;}
+                        </style>,
+                      ],
+                    },
+                  }
+                }
+                isStringTag={true}
+                serialized={
+                  Object {
+                    "map": undefined,
+                    "name": "jcaat8-euiToolTipAnchor-inlineBlock",
+                    "next": undefined,
+                    "styles": "*[disabled]{pointer-events:none;};label:euiToolTipAnchor;;;display:inline-block;label:inlineBlock;;;",
+                    "toString": [Function],
+                  }
+                }
+              />
+              <span
+                className="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
+                onMouseOut={[Function]}
+                onMouseOver={[Function]}
               >
-                <span
-                  color="primary"
-                  data-euiicon-type="minusInCircle"
-                  size="s"
-                />
-              </EuiIcon>
-            </button>
-          </span>
+                <button
+                  aria-label="Filter out value"
+                  className="kbnDocTableRowFilterButton"
+                  data-test-subj="docTableCellFilterNegate"
+                  onBlur={[Function]}
+                  onClick={[Function]}
+                  onFocus={[Function]}
+                >
+                  <EuiIcon
+                    color="primary"
+                    size="s"
+                    type="minusInCircle"
+                  >
+                    <span
+                      color="primary"
+                      data-euiicon-type="minusInCircle"
+                      size="s"
+                    />
+                  </EuiIcon>
+                </button>
+              </span>
+            </span>
+          </EuiToolTipAnchor>
         </EuiToolTip>
       </span>
     </TableCellActions>
diff --git a/src/plugins/discover/public/components/field_name/__snapshots__/field_name.test.tsx.snap b/src/plugins/discover/public/components/field_name/__snapshots__/field_name.test.tsx.snap
index d0bb6ae9e448..9cd75729a99c 100644
--- a/src/plugins/discover/public/components/field_name/__snapshots__/field_name.test.tsx.snap
+++ b/src/plugins/discover/public/components/field_name/__snapshots__/field_name.test.tsx.snap
@@ -23,7 +23,7 @@ Array [
       class="euiFlexItem euiFlexItem--flexGrowZero kbnDocViewer__fieldName eui-textBreakAll"
     >
       <span
-        class="euiToolTipAnchor eui-textBreakAll"
+        class="euiToolTipAnchor eui-textBreakAll emotion-euiToolTipAnchor-inlineBlock"
       >
         <span>
           test.test.test
@@ -57,7 +57,7 @@ Array [
       class="euiFlexItem euiFlexItem--flexGrowZero kbnDocViewer__fieldName eui-textBreakAll"
     >
       <span
-        class="euiToolTipAnchor eui-textBreakAll"
+        class="euiToolTipAnchor eui-textBreakAll emotion-euiToolTipAnchor-inlineBlock"
       >
         <span>
           test.test.test
@@ -91,7 +91,7 @@ Array [
       class="euiFlexItem euiFlexItem--flexGrowZero kbnDocViewer__fieldName eui-textBreakAll"
     >
       <span
-        class="euiToolTipAnchor eui-textBreakAll"
+        class="euiToolTipAnchor eui-textBreakAll emotion-euiToolTipAnchor-inlineBlock"
       >
         <span>
           test
@@ -125,7 +125,7 @@ Array [
       class="euiFlexItem euiFlexItem--flexGrowZero kbnDocViewer__fieldName eui-textBreakAll"
     >
       <span
-        class="euiToolTipAnchor eui-textBreakAll"
+        class="euiToolTipAnchor eui-textBreakAll emotion-euiToolTipAnchor-inlineBlock"
       >
         <span>
           test.test.test
diff --git a/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/__snapshots__/custom_icon_modal.test.tsx.snap b/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/__snapshots__/custom_icon_modal.test.tsx.snap
index 10e4f06acae0..7d712e7e9ab3 100644
--- a/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/__snapshots__/custom_icon_modal.test.tsx.snap
+++ b/x-pack/plugins/maps/public/classes/styles/vector/components/symbol/__snapshots__/custom_icon_modal.test.tsx.snap
@@ -202,6 +202,7 @@ exports[`should render a custom icon modal with an existing icon 1`] = `
           color="danger"
           data-test-subj="mapsCustomIconForm-submit"
           onClick={[Function]}
+          size="m"
         >
           Delete
         </EuiButton>
@@ -210,10 +211,12 @@ exports[`should render a custom icon modal with an existing icon 1`] = `
         grow={false}
       >
         <EuiButton
+          color="primary"
           data-test-subj="mapsCustomIconForm-submit"
           fill={true}
           isDisabled={false}
           onClick={[Function]}
+          size="m"
         >
           Save
         </EuiButton>
@@ -291,10 +294,12 @@ exports[`should render an empty custom icon modal 1`] = `
         grow={false}
       >
         <EuiButton
+          color="primary"
           data-test-subj="mapsCustomIconForm-submit"
           fill={true}
           isDisabled={true}
           onClick={[Function]}
+          size="m"
         >
           Save
         </EuiButton>
diff --git a/x-pack/plugins/maps/public/components/tooltip_selector/__snapshots__/add_tooltip_field_popover.test.tsx.snap b/x-pack/plugins/maps/public/components/tooltip_selector/__snapshots__/add_tooltip_field_popover.test.tsx.snap
index f53bfbce0651..ac46e95468a5 100644
--- a/x-pack/plugins/maps/public/components/tooltip_selector/__snapshots__/add_tooltip_field_popover.test.tsx.snap
+++ b/x-pack/plugins/maps/public/components/tooltip_selector/__snapshots__/add_tooltip_field_popover.test.tsx.snap
@@ -61,6 +61,7 @@ exports[`Should remove selected fields from selectable 1`] = `
       textAlign="right"
     >
       <EuiButton
+        color="primary"
         fill={true}
         isDisabled={true}
         onClick={[Function]}
@@ -152,6 +153,7 @@ exports[`Should render 1`] = `
       textAlign="right"
     >
       <EuiButton
+        color="primary"
         fill={true}
         isDisabled={true}
         onClick={[Function]}
diff --git a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/__snapshots__/layer_control.test.tsx.snap b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/__snapshots__/layer_control.test.tsx.snap
index 7d0c67ff4179..fd4a7da30f42 100644
--- a/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/__snapshots__/layer_control.test.tsx.snap
+++ b/x-pack/plugins/maps/public/connected_components/right_side_controls/layer_control/__snapshots__/layer_control.test.tsx.snap
@@ -63,11 +63,13 @@ exports[`LayerControl is rendered 1`] = `
   />
   <EuiButton
     className="mapLayerControl__addLayerButton"
+    color="primary"
     data-test-subj="addLayerButton"
     fill={true}
     fullWidth={true}
     isDisabled={false}
     onClick={[Function]}
+    size="m"
   >
     <FormattedMessage
       defaultMessage="Add layer"
@@ -277,11 +279,13 @@ exports[`LayerControl should disable buttons when flyout is open 1`] = `
   />
   <EuiButton
     className="mapLayerControl__addLayerButton"
+    color="primary"
     data-test-subj="addLayerButton"
     fill={true}
     fullWidth={true}
     isDisabled={true}
     onClick={[Function]}
+    size="m"
   >
     <FormattedMessage
       defaultMessage="Add layer"
diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/__snapshots__/tools_control.test.tsx.snap b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/__snapshots__/tools_control.test.tsx.snap
index 2ddfe6b7758f..07ed777490b3 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/__snapshots__/tools_control.test.tsx.snap
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/__snapshots__/tools_control.test.tsx.snap
@@ -91,6 +91,7 @@ exports[`Should render cancel button when drawing 1`] = `
   </EuiFlexItem>
   <EuiFlexItem>
     <EuiButton
+      color="primary"
       fill={true}
       onClick={[Function]}
       size="s"
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/components/certificates/__snapshots__/cert_monitors.test.tsx.snap b/x-pack/plugins/synthetics/public/legacy_uptime/components/certificates/__snapshots__/cert_monitors.test.tsx.snap
index f5a46f648b41..6e5254db66ae 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/components/certificates/__snapshots__/cert_monitors.test.tsx.snap
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/components/certificates/__snapshots__/cert_monitors.test.tsx.snap
@@ -4,7 +4,7 @@ exports[`CertMonitors renders expected elements for valid props 1`] = `
 <span>
   <span>
     <span
-      class="euiToolTipAnchor"
+      class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
     >
       <button
         class="euiLink emotion-euiLink-primary"
@@ -22,7 +22,7 @@ exports[`CertMonitors renders expected elements for valid props 1`] = `
   <span>
     , 
     <span
-      class="euiToolTipAnchor"
+      class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
     >
       <button
         class="euiLink emotion-euiLink-primary"
@@ -40,7 +40,7 @@ exports[`CertMonitors renders expected elements for valid props 1`] = `
   <span>
     , 
     <span
-      class="euiToolTipAnchor"
+      class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
     >
       <button
         class="euiLink emotion-euiLink-primary"
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/components/common/__snapshots__/monitor_tags.test.tsx.snap b/x-pack/plugins/synthetics/public/legacy_uptime/components/common/__snapshots__/monitor_tags.test.tsx.snap
index 0515a8aa90d6..2d8301f19a6a 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/components/common/__snapshots__/monitor_tags.test.tsx.snap
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/components/common/__snapshots__/monitor_tags.test.tsx.snap
@@ -8,16 +8,16 @@ exports[`MonitorTags component it shows expand tag on too many tags 1`] = `
     class="euiBadgeGroup__item"
   >
     <a
-      class="euiBadge euiBadge-isClickable euiBadge--hollow euiBadge--iconLeft eui-textTruncate"
+      class="euiBadge eui-textTruncate emotion-euiBadge-clickable-hollow"
       href="/?filters=[[\\"tags\\",[\\"red\\"]]]"
       rel="noreferrer"
       style="max-width:120px"
     >
       <span
-        class="euiBadge__content"
+        class="euiBadge__content emotion-euiBadge__content"
       >
         <span
-          class="euiBadge__text"
+          class="euiBadge__text emotion-euiBadge__text-clickable"
         >
           red
         </span>
@@ -28,16 +28,16 @@ exports[`MonitorTags component it shows expand tag on too many tags 1`] = `
     class="euiBadgeGroup__item"
   >
     <a
-      class="euiBadge euiBadge-isClickable euiBadge--hollow euiBadge--iconLeft eui-textTruncate"
+      class="euiBadge eui-textTruncate emotion-euiBadge-clickable-hollow"
       href="/?filters=[[\\"tags\\",[\\"green\\"]]]"
       rel="noreferrer"
       style="max-width:120px"
     >
       <span
-        class="euiBadge__content"
+        class="euiBadge__content emotion-euiBadge__content"
       >
         <span
-          class="euiBadge__text"
+          class="euiBadge__text emotion-euiBadge__text-clickable"
         >
           green
         </span>
@@ -48,16 +48,16 @@ exports[`MonitorTags component it shows expand tag on too many tags 1`] = `
     class="euiBadgeGroup__item"
   >
     <a
-      class="euiBadge euiBadge-isClickable euiBadge--hollow euiBadge--iconLeft eui-textTruncate"
+      class="euiBadge eui-textTruncate emotion-euiBadge-clickable-hollow"
       href="/?filters=[[\\"tags\\",[\\"blue\\"]]]"
       rel="noreferrer"
       style="max-width:120px"
     >
       <span
-        class="euiBadge__content"
+        class="euiBadge__content emotion-euiBadge__content"
       >
         <span
-          class="euiBadge__text"
+          class="euiBadge__text emotion-euiBadge__text-clickable"
         >
           blue
         </span>
@@ -68,16 +68,16 @@ exports[`MonitorTags component it shows expand tag on too many tags 1`] = `
     class="euiBadgeGroup__item"
   >
     <a
-      class="euiBadge euiBadge-isClickable euiBadge--hollow euiBadge--iconLeft eui-textTruncate"
+      class="euiBadge eui-textTruncate emotion-euiBadge-clickable-hollow"
       href="/?filters=[[\\"tags\\",[\\"black\\"]]]"
       rel="noreferrer"
       style="max-width:120px"
     >
       <span
-        class="euiBadge__content"
+        class="euiBadge__content emotion-euiBadge__content"
       >
         <span
-          class="euiBadge__text"
+          class="euiBadge__text emotion-euiBadge__text-clickable"
         >
           black
         </span>
@@ -88,16 +88,16 @@ exports[`MonitorTags component it shows expand tag on too many tags 1`] = `
     class="euiBadgeGroup__item"
   >
     <a
-      class="euiBadge euiBadge-isClickable euiBadge--hollow euiBadge--iconLeft eui-textTruncate"
+      class="euiBadge eui-textTruncate emotion-euiBadge-clickable-hollow"
       href="/?filters=[[\\"tags\\",[\\"purple\\"]]]"
       rel="noreferrer"
       style="max-width:120px"
     >
       <span
-        class="euiBadge__content"
+        class="euiBadge__content emotion-euiBadge__content"
       >
         <span
-          class="euiBadge__text"
+          class="euiBadge__text emotion-euiBadge__text-clickable"
         >
           purple
         </span>
@@ -109,13 +109,13 @@ exports[`MonitorTags component it shows expand tag on too many tags 1`] = `
   >
     <button
       aria-label="Click to view remaining tags"
-      class="euiBadge euiBadge-isClickable euiBadge--hollow euiBadge--iconLeft"
+      class="euiBadge emotion-euiBadge-clickable-hollow"
     >
       <span
-        class="euiBadge__content"
+        class="euiBadge__content emotion-euiBadge__content"
       >
         <span
-          class="euiBadge__text"
+          class="euiBadge__text emotion-euiBadge__text-clickable"
         >
           +1
         </span>
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/ml/__snapshots__/ml_integerations.test.tsx.snap b/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/ml/__snapshots__/ml_integerations.test.tsx.snap
index 1bdc9dcf6ec0..26e535d6ffcc 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/ml/__snapshots__/ml_integerations.test.tsx.snap
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/ml/__snapshots__/ml_integerations.test.tsx.snap
@@ -9,21 +9,21 @@ exports[`ML Integrations renders without errors 1`] = `
   >
     <button
       aria-label="You can enable anomaly detection job or if job is already there you can manage the job or alert."
-      class="euiButton euiButton--primary euiButton--small euiButton-isDisabled"
+      class="euiButton emotion-euiButtonDisplay-s-isDisabled-s-base-disabled"
       data-test-subj="uptimeEnableAnomalyBtn"
       disabled=""
       type="button"
     >
       <span
-        class="euiButtonContent euiButton__content"
+        class="emotion-euiButtonDisplayContent"
       >
         <span
           aria-label="Loading"
-          class="euiLoadingSpinner euiButtonContent__spinner emotion-euiLoadingSpinner-m"
+          class="euiLoadingSpinner emotion-euiLoadingSpinner-m-euiButtonDisplayContent__spinner"
           role="progressbar"
         />
         <span
-          class="euiButton__text"
+          class="eui-textTruncate"
         />
       </span>
     </button>
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/ping_list/__snapshots__/expanded_row.test.tsx.snap b/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/ping_list/__snapshots__/expanded_row.test.tsx.snap
index 1e3f7b0edafb..dfc908c079d0 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/ping_list/__snapshots__/expanded_row.test.tsx.snap
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/ping_list/__snapshots__/expanded_row.test.tsx.snap
@@ -150,7 +150,7 @@ exports[`PingListExpandedRow renders link to docs if body is not recorded but it
           data-type="row"
         >
           <dt
-            class="euiDescriptionList__title emotion-euiDescriptionList__title-row-normal"
+            class="euiDescriptionList__title emotion-euiDescriptionList__title-row-m-normal"
           >
             Response Body
           </dt>
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/status_details/__snapshots__/monitor_status.bar.test.tsx.snap b/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/status_details/__snapshots__/monitor_status.bar.test.tsx.snap
index 61ce98e3ee67..19a4378b09d1 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/status_details/__snapshots__/monitor_status.bar.test.tsx.snap
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/status_details/__snapshots__/monitor_status.bar.test.tsx.snap
@@ -27,43 +27,43 @@ Array [
     data-type="column"
   >
     <dt
-      class="euiDescriptionList__title c0 emotion-euiDescriptionList__title-column-reverse"
+      class="euiDescriptionList__title c0 emotion-euiDescriptionList__title-column-m-reverse"
     >
       Overall availability
     </dt>
     <dd
-      class="euiDescriptionList__description c1 emotion-euiDescriptionList__description-column-compressed"
+      class="euiDescriptionList__description c1 emotion-euiDescriptionList__description-column-compressed-m"
       data-test-subj="uptimeOverallAvailability"
     >
       0.00 %
     </dd>
     <dt
-      class="euiDescriptionList__title c0 emotion-euiDescriptionList__title-column-reverse"
+      class="euiDescriptionList__title c0 emotion-euiDescriptionList__title-column-m-reverse"
     >
       Url
     </dt>
     <dd
-      class="euiDescriptionList__description c1 emotion-euiDescriptionList__description-column-compressed"
+      class="euiDescriptionList__description c1 emotion-euiDescriptionList__description-column-compressed-m"
       data-test-subj="monitor-page-url"
     >
       --
     </dd>
     <dt
-      class="euiDescriptionList__title c0 emotion-euiDescriptionList__title-column-reverse"
+      class="euiDescriptionList__title c0 emotion-euiDescriptionList__title-column-m-reverse"
     >
       Monitor ID
     </dt>
     <dd
-      class="euiDescriptionList__description c1 emotion-euiDescriptionList__description-column-compressed"
+      class="euiDescriptionList__description c1 emotion-euiDescriptionList__description-column-compressed-m"
       data-test-subj="monitor-page-title"
     />
     <dt
-      class="euiDescriptionList__title c0 emotion-euiDescriptionList__title-column-reverse"
+      class="euiDescriptionList__title c0 emotion-euiDescriptionList__title-column-m-reverse"
     >
       Tags
     </dt>
     <dd
-      class="euiDescriptionList__description c1 emotion-euiDescriptionList__description-column-compressed"
+      class="euiDescriptionList__description c1 emotion-euiDescriptionList__description-column-compressed-m"
     >
       <a
         class="euiLink emotion-euiLink-primary"
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/status_details/__snapshots__/ssl_certificate.test.tsx.snap b/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/status_details/__snapshots__/ssl_certificate.test.tsx.snap
index 06b22d704238..e5b7e976fd47 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/status_details/__snapshots__/ssl_certificate.test.tsx.snap
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/status_details/__snapshots__/ssl_certificate.test.tsx.snap
@@ -8,7 +8,7 @@ Array [
 }
 
 <dt
-    class="euiDescriptionList__title c0 emotion-euiDescriptionList__title-row-normal"
+    class="euiDescriptionList__title c0 emotion-euiDescriptionList__title-row-m-normal"
   >
     TLS Certificate
   </dt>,
@@ -34,7 +34,7 @@ Array [
       href="/certificates"
     >
       <span
-        class="euiToolTipAnchor"
+        class="euiToolTipAnchor emotion-euiToolTipAnchor-inlineBlock"
       >
         <div
           class="euiText emotion-euiText-s"
@@ -63,7 +63,7 @@ Array [
 }
 
 <dt
-    class="euiDescriptionList__title c0 emotion-euiDescriptionList__title-row-normal"
+    class="euiDescriptionList__title c0 emotion-euiDescriptionList__title-row-m-normal"
   >
     TLS Certificate
   </dt>,
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/status_details/availability_reporting/__snapshots__/tag_label.test.tsx.snap b/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/status_details/availability_reporting/__snapshots__/tag_label.test.tsx.snap
index 345a8f2786d4..31b1875796f7 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/status_details/availability_reporting/__snapshots__/tag_label.test.tsx.snap
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/components/monitor/status_details/availability_reporting/__snapshots__/tag_label.test.tsx.snap
@@ -17,14 +17,14 @@ exports[`TagLabel component renders correctly against snapshot 1`] = `
   class="c0"
 >
   <span
-    class="euiBadge euiBadge--iconLeft"
+    class="euiBadge emotion-euiBadge"
     style="background-color:#ff7e62;color:#000"
   >
     <span
-      class="euiBadge__content"
+      class="euiBadge__content emotion-euiBadge__content"
     >
       <span
-        class="euiBadge__text"
+        class="euiBadge__text emotion-euiBadge__text"
       >
         US-East
       </span>
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/components/overview/monitor_list/__snapshots__/filter_status_button.test.tsx.snap b/x-pack/plugins/synthetics/public/legacy_uptime/components/overview/monitor_list/__snapshots__/filter_status_button.test.tsx.snap
index a7e1400b3d7d..36cfb5e426c1 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/components/overview/monitor_list/__snapshots__/filter_status_button.test.tsx.snap
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/components/overview/monitor_list/__snapshots__/filter_status_button.test.tsx.snap
@@ -2,7 +2,7 @@
 
 exports[`FilterStatusButton renders without errors for valid props 1`] = `
 <button
-  class="euiButtonEmpty euiButtonEmpty--text euiFilterButton euiFilterButton-hasActiveFilters euiFilterButton--withNext"
+  class="euiButtonEmpty euiFilterButton euiFilterButton-hasActiveFilters euiFilterButton--withNext css-wvaqcf-empty-text"
   data-test-subj="foo"
   type="button"
 >
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/components/overview/monitor_list/__snapshots__/status_filter.test.tsx.snap b/x-pack/plugins/synthetics/public/legacy_uptime/components/overview/monitor_list/__snapshots__/status_filter.test.tsx.snap
index 98a60c79ca49..ce9986f5fb2c 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/components/overview/monitor_list/__snapshots__/status_filter.test.tsx.snap
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/components/overview/monitor_list/__snapshots__/status_filter.test.tsx.snap
@@ -5,7 +5,7 @@ exports[`StatusFilterComponent renders without errors for valid props 1`] = `
   class="euiFilterGroup"
 >
   <button
-    class="euiButtonEmpty euiButtonEmpty--text euiFilterButton euiFilterButton-hasActiveFilters euiFilterButton--withNext"
+    class="euiButtonEmpty euiFilterButton euiFilterButton-hasActiveFilters euiFilterButton--withNext css-wvaqcf-empty-text"
     data-test-subj="xpack.synthetics.filterBar.filterStatusAll"
     type="button"
   >
@@ -26,7 +26,7 @@ exports[`StatusFilterComponent renders without errors for valid props 1`] = `
     </span>
   </button>
   <button
-    class="euiButtonEmpty euiButtonEmpty--text euiFilterButton euiFilterButton--withNext"
+    class="euiButtonEmpty euiFilterButton euiFilterButton--withNext css-wvaqcf-empty-text"
     data-test-subj="xpack.synthetics.filterBar.filterStatusUp"
     type="button"
   >
@@ -47,7 +47,7 @@ exports[`StatusFilterComponent renders without errors for valid props 1`] = `
     </span>
   </button>
   <button
-    class="euiButtonEmpty euiButtonEmpty--text euiFilterButton"
+    class="euiButtonEmpty euiFilterButton css-wvaqcf-empty-text"
     data-test-subj="xpack.synthetics.filterBar.filterStatusDown"
     type="button"
   >
diff --git a/x-pack/plugins/synthetics/public/legacy_uptime/components/overview/monitor_list/monitor_list_drawer/__snapshots__/most_recent_error.test.tsx.snap b/x-pack/plugins/synthetics/public/legacy_uptime/components/overview/monitor_list/monitor_list_drawer/__snapshots__/most_recent_error.test.tsx.snap
index 898e789b76e5..04027e4a9bc3 100644
--- a/x-pack/plugins/synthetics/public/legacy_uptime/components/overview/monitor_list/monitor_list_drawer/__snapshots__/most_recent_error.test.tsx.snap
+++ b/x-pack/plugins/synthetics/public/legacy_uptime/components/overview/monitor_list/monitor_list_drawer/__snapshots__/most_recent_error.test.tsx.snap
@@ -6,7 +6,7 @@ exports[`MostRecentError component renders properly with mock data 1`] = `
   data-type="row"
 >
   <dt
-    class="euiDescriptionList__title emotion-euiDescriptionList__title-row-normal"
+    class="euiDescriptionList__title emotion-euiDescriptionList__title-row-m-normal"
   >
     Most recent error (5 days ago)
   </dt>