From 361c78347c4f27d834ba3ef1af1f3b5a02ba9b8b Mon Sep 17 00:00:00 2001
From: Samuel Valdes Gutierrez <valdesgutierrez@gmail.com>
Date: Fri, 17 Nov 2023 12:36:31 +0000
Subject: [PATCH] Updating test snapshoots related to change in
 button_content.tsx

Signed-off-by: Samuel Valdes Gutierrez <valdesgutierrez@gmail.com>
---
 .../__snapshots__/skip_link.test.tsx.snap     |   18 +
 .../in_memory_table.test.tsx.snap             |   28 +-
 .../button/__snapshots__/button.test.tsx.snap |  112 +-
 .../button_content.test.tsx.snap              |   51 +-
 .../__snapshots__/button_empty.test.tsx.snap  |  109 +-
 .../__snapshots__/button_group.test.tsx.snap  | 1152 +++++++++++------
 .../card/__snapshots__/card.test.tsx.snap     |    6 +
 .../__snapshots__/card_select.test.tsx.snap   |   24 +-
 .../__snapshots__/control_bar.test.tsx.snap   |   42 +
 .../__snapshots__/data_grid.test.tsx.snap     |  162 ++-
 .../__snapshots__/filter_button.test.tsx.snap |   39 +-
 .../__snapshots__/header_link.test.tsx.snap   |    9 +
 .../__snapshots__/header_links.test.tsx.snap  |    3 +
 .../header_section_item_button.test.tsx.snap  |   18 +
 .../markdown_editor.test.tsx.snap             |   60 +-
 .../__snapshots__/confirm_modal.test.tsx.snap |   12 +
 .../notification_event.test.tsx.snap          |   15 +-
 .../__snapshots__/pagination.test.tsx.snap    |    3 +
 .../pagination_button.test.tsx.snap           |    3 +
 .../__snapshots__/side_nav.test.tsx.snap      |   12 +-
 .../table_sort_mobile.test.tsx.snap           |   12 +-
 .../table_pagination.test.tsx.snap            |   42 +-
 22 files changed, 1403 insertions(+), 529 deletions(-)

diff --git a/src/components/accessibility/__snapshots__/skip_link.test.tsx.snap b/src/components/accessibility/__snapshots__/skip_link.test.tsx.snap
index 5e3ba6fdaa..a06b117221 100644
--- a/src/components/accessibility/__snapshots__/skip_link.test.tsx.snap
+++ b/src/components/accessibility/__snapshots__/skip_link.test.tsx.snap
@@ -11,6 +11,9 @@ exports[`OuiSkipLink is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     >
@@ -29,6 +32,9 @@ exports[`OuiSkipLink props onClick is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     />
@@ -45,6 +51,9 @@ exports[`OuiSkipLink props position absolute is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     />
@@ -62,6 +71,9 @@ exports[`OuiSkipLink props position fixed is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     />
@@ -78,6 +90,9 @@ exports[`OuiSkipLink props position static is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     />
@@ -95,6 +110,9 @@ exports[`OuiSkipLink props tabIndex is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     />
diff --git a/src/components/basic_table/__snapshots__/in_memory_table.test.tsx.snap b/src/components/basic_table/__snapshots__/in_memory_table.test.tsx.snap
index ac72079baf..6acb2294a2 100644
--- a/src/components/basic_table/__snapshots__/in_memory_table.test.tsx.snap
+++ b/src/components/basic_table/__snapshots__/in_memory_table.test.tsx.snap
@@ -418,19 +418,23 @@ exports[`OuiInMemoryTable behavior pagination 1`] = `
                                 <span
                                   className="ouiButtonContent ouiButtonContent--iconRight ouiButtonEmpty__content"
                                 >
-                                  <OuiIcon
-                                    className="ouiButtonContent__icon"
-                                    color="inherit"
-                                    size="s"
-                                    type="arrowDown"
+                                  <span
+                                    className=""
                                   >
-                                    <span
+                                    <OuiIcon
                                       className="ouiButtonContent__icon"
                                       color="inherit"
-                                      data-ouiicon-type="arrowDown"
                                       size="s"
-                                    />
-                                  </OuiIcon>
+                                      type="arrowDown"
+                                    >
+                                      <span
+                                        className="ouiButtonContent__icon"
+                                        color="inherit"
+                                        data-ouiicon-type="arrowDown"
+                                        size="s"
+                                      />
+                                    </OuiIcon>
+                                  </span>
                                   <span
                                     className="ouiButtonEmpty__text"
                                   >
@@ -587,6 +591,9 @@ exports[`OuiInMemoryTable behavior pagination 1`] = `
                                           <span
                                             className="ouiButtonContent ouiButtonEmpty__content"
                                           >
+                                            <span
+                                              className=""
+                                            />
                                             <span
                                               className="ouiButtonEmpty__text"
                                             >
@@ -670,6 +677,9 @@ exports[`OuiInMemoryTable behavior pagination 1`] = `
                                           <span
                                             className="ouiButtonContent ouiButtonEmpty__content"
                                           >
+                                            <span
+                                              className=""
+                                            />
                                             <span
                                               className="ouiButtonEmpty__text"
                                             >
diff --git a/src/components/button/__snapshots__/button.test.tsx.snap b/src/components/button/__snapshots__/button.test.tsx.snap
index 23d70d6fdb..d783a4880e 100644
--- a/src/components/button/__snapshots__/button.test.tsx.snap
+++ b/src/components/button/__snapshots__/button.test.tsx.snap
@@ -10,6 +10,9 @@ exports[`OuiButton is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     >
@@ -27,6 +30,9 @@ exports[`OuiButton props color accent is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     />
@@ -42,6 +48,9 @@ exports[`OuiButton props color danger is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     />
@@ -57,6 +66,9 @@ exports[`OuiButton props color ghost is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     />
@@ -72,6 +84,9 @@ exports[`OuiButton props color primary is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     />
@@ -87,6 +102,9 @@ exports[`OuiButton props color secondary is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     />
@@ -102,6 +120,9 @@ exports[`OuiButton props color success is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     />
@@ -117,6 +138,9 @@ exports[`OuiButton props color text is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     />
@@ -132,6 +156,9 @@ exports[`OuiButton props color warning is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     />
@@ -149,6 +176,9 @@ exports[`OuiButton props contentProps is rendered 1`] = `
     class="ouiButtonContent ouiButton__content testClass1 testClass2"
     data-test-subj="test subject string"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     >
@@ -166,6 +196,9 @@ exports[`OuiButton props fill is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     />
@@ -181,6 +214,9 @@ exports[`OuiButton props fullWidth is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     />
@@ -198,6 +234,9 @@ exports[`OuiButton props href secures the rel attribute when the target is _blan
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     />
@@ -214,10 +253,14 @@ exports[`OuiButton props iconSide left is rendered 1`] = `
     class="ouiButtonContent ouiButton__content"
   >
     <span
-      class="ouiButtonContent__icon"
-      color="inherit"
-      data-ouiicon-type="user"
-    />
+      class=""
+    >
+      <span
+        class="ouiButtonContent__icon"
+        color="inherit"
+        data-ouiicon-type="user"
+      />
+    </span>
     <span
       class="ouiButton__text"
     >
@@ -236,10 +279,14 @@ exports[`OuiButton props iconSide right is rendered 1`] = `
     class="ouiButtonContent ouiButtonContent--iconRight ouiButton__content"
   >
     <span
-      class="ouiButtonContent__icon"
-      color="inherit"
-      data-ouiicon-type="user"
-    />
+      class=""
+    >
+      <span
+        class="ouiButtonContent__icon"
+        color="inherit"
+        data-ouiicon-type="user"
+      />
+    </span>
     <span
       class="ouiButton__text"
     >
@@ -258,10 +305,14 @@ exports[`OuiButton props iconType is rendered 1`] = `
     class="ouiButtonContent ouiButton__content"
   >
     <span
-      class="ouiButtonContent__icon"
-      color="inherit"
-      data-ouiicon-type="user"
-    />
+      class=""
+    >
+      <span
+        class="ouiButtonContent__icon"
+        color="inherit"
+        data-ouiicon-type="user"
+      />
+    </span>
     <span
       class="ouiButton__text"
     />
@@ -278,6 +329,9 @@ exports[`OuiButton props isDisabled is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     />
@@ -294,6 +348,9 @@ exports[`OuiButton props isDisabled renders a button even when href is defined 1
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     />
@@ -310,6 +367,9 @@ exports[`OuiButton props isDisabled renders if passed as disabled 1`] = `
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     />
@@ -327,8 +387,12 @@ exports[`OuiButton props isLoading is rendered 1`] = `
     class="ouiButtonContent ouiButton__content"
   >
     <span
-      class="ouiLoadingSpinner ouiLoadingSpinner--medium ouiButtonContent__spinner"
-    />
+      class=""
+    >
+      <span
+        class="ouiLoadingSpinner ouiLoadingSpinner--medium ouiButtonContent__spinner"
+      />
+    </span>
     <span
       class="ouiButton__text"
     />
@@ -345,6 +409,9 @@ exports[`OuiButton props isSelected is rendered as false 1`] = `
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     />
@@ -361,6 +428,9 @@ exports[`OuiButton props isSelected is rendered as true 1`] = `
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     />
@@ -377,6 +447,9 @@ exports[`OuiButton props minWidth is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     />
@@ -392,6 +465,9 @@ exports[`OuiButton props size m is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     />
@@ -407,6 +483,9 @@ exports[`OuiButton props size s is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButton__text"
     />
@@ -422,6 +501,11 @@ exports[`OuiButton props textProps is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButton__content"
   >
+    <span
+      aria-label="aria-label"
+      class=""
+      data-test-subj="test subject string"
+    />
     <span
       aria-label="aria-label"
       class="ouiButton__text testClass1 testClass2"
diff --git a/src/components/button/__snapshots__/button_content.test.tsx.snap b/src/components/button/__snapshots__/button_content.test.tsx.snap
index 299c7c9648..e00cef4581 100644
--- a/src/components/button/__snapshots__/button_content.test.tsx.snap
+++ b/src/components/button/__snapshots__/button_content.test.tsx.snap
@@ -6,6 +6,9 @@ exports[`OuiButtonContent is rendered 1`] = `
   class="ouiButtonContent testClass1 testClass2"
   data-test-subj="test subject string"
 >
+  <span
+    class=""
+  />
   <span />
 </span>
 `;
@@ -14,6 +17,9 @@ exports[`OuiButtonContent props children is rendered 1`] = `
 <span
   class="ouiButtonContent"
 >
+  <span
+    class=""
+  />
   <span>
     Content
   </span>
@@ -25,10 +31,14 @@ exports[`OuiButtonContent props iconSide is rendered 1`] = `
   class="ouiButtonContent ouiButtonContent--iconRight"
 >
   <span
-    class="ouiButtonContent__icon"
-    color="inherit"
-    data-ouiicon-type="bolt"
-  />
+    class=""
+  >
+    <span
+      class="ouiButtonContent__icon"
+      color="inherit"
+      data-ouiicon-type="bolt"
+    />
+  </span>
   <span />
 </span>
 `;
@@ -38,10 +48,14 @@ exports[`OuiButtonContent props iconType is rendered 1`] = `
   class="ouiButtonContent"
 >
   <span
-    class="ouiButtonContent__icon"
-    color="inherit"
-    data-ouiicon-type="bolt"
-  />
+    class=""
+  >
+    <span
+      class="ouiButtonContent__icon"
+      color="inherit"
+      data-ouiicon-type="bolt"
+    />
+  </span>
   <span />
 </span>
 `;
@@ -51,8 +65,12 @@ exports[`OuiButtonContent props isLoading is rendered 1`] = `
   class="ouiButtonContent"
 >
   <span
-    class="ouiLoadingSpinner ouiLoadingSpinner--medium ouiButtonContent__spinner"
-  />
+    class=""
+  >
+    <span
+      class="ouiLoadingSpinner ouiLoadingSpinner--medium ouiButtonContent__spinner"
+    />
+  </span>
   <span />
 </span>
 `;
@@ -62,8 +80,12 @@ exports[`OuiButtonContent props isLoading replaces iconType with spinner 1`] = `
   class="ouiButtonContent"
 >
   <span
-    class="ouiLoadingSpinner ouiLoadingSpinner--medium ouiButtonContent__spinner"
-  />
+    class=""
+  >
+    <span
+      class="ouiLoadingSpinner ouiLoadingSpinner--medium ouiButtonContent__spinner"
+    />
+  </span>
   <span />
 </span>
 `;
@@ -72,6 +94,11 @@ exports[`OuiButtonContent props textProps is rendered 1`] = `
 <span
   class="ouiButtonContent"
 >
+  <span
+    aria-label="aria-label"
+    class=""
+    data-test-subj="test subject string"
+  />
   <span
     aria-label="aria-label"
     class="testClass1 testClass2"
diff --git a/src/components/button/button_empty/__snapshots__/button_empty.test.tsx.snap b/src/components/button/button_empty/__snapshots__/button_empty.test.tsx.snap
index 9bb95ce7bc..222605a514 100644
--- a/src/components/button/button_empty/__snapshots__/button_empty.test.tsx.snap
+++ b/src/components/button/button_empty/__snapshots__/button_empty.test.tsx.snap
@@ -10,6 +10,9 @@ exports[`OuiButtonEmpty is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     >
@@ -27,6 +30,9 @@ exports[`OuiButtonEmpty props color danger is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     />
@@ -42,6 +48,9 @@ exports[`OuiButtonEmpty props color ghost is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     />
@@ -57,6 +66,9 @@ exports[`OuiButtonEmpty props color primary is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     />
@@ -72,6 +84,9 @@ exports[`OuiButtonEmpty props color success is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     />
@@ -87,6 +102,9 @@ exports[`OuiButtonEmpty props color text is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     />
@@ -102,6 +120,9 @@ exports[`OuiButtonEmpty props color warning is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     />
@@ -119,6 +140,9 @@ exports[`OuiButtonEmpty props contentProps is rendered 1`] = `
     class="ouiButtonContent ouiButtonEmpty__content testClass1 testClass2"
     data-test-subj="test subject string"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     >
@@ -136,6 +160,9 @@ exports[`OuiButtonEmpty props flush both is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     />
@@ -151,6 +178,9 @@ exports[`OuiButtonEmpty props flush left is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     />
@@ -166,6 +196,9 @@ exports[`OuiButtonEmpty props flush right is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     />
@@ -183,6 +216,9 @@ exports[`OuiButtonEmpty props href secures the rel attribute when the target is
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     />
@@ -199,10 +235,14 @@ exports[`OuiButtonEmpty props iconSide left is rendered 1`] = `
     class="ouiButtonContent ouiButtonEmpty__content"
   >
     <span
-      class="ouiButtonContent__icon"
-      color="inherit"
-      data-ouiicon-type="user"
-    />
+      class=""
+    >
+      <span
+        class="ouiButtonContent__icon"
+        color="inherit"
+        data-ouiicon-type="user"
+      />
+    </span>
     <span
       class="ouiButtonEmpty__text"
     >
@@ -221,10 +261,14 @@ exports[`OuiButtonEmpty props iconSide right is rendered 1`] = `
     class="ouiButtonContent ouiButtonContent--iconRight ouiButtonEmpty__content"
   >
     <span
-      class="ouiButtonContent__icon"
-      color="inherit"
-      data-ouiicon-type="user"
-    />
+      class=""
+    >
+      <span
+        class="ouiButtonContent__icon"
+        color="inherit"
+        data-ouiicon-type="user"
+      />
+    </span>
     <span
       class="ouiButtonEmpty__text"
     >
@@ -243,10 +287,14 @@ exports[`OuiButtonEmpty props iconType is rendered 1`] = `
     class="ouiButtonContent ouiButtonEmpty__content"
   >
     <span
-      class="ouiButtonContent__icon"
-      color="inherit"
-      data-ouiicon-type="user"
-    />
+      class=""
+    >
+      <span
+        class="ouiButtonContent__icon"
+        color="inherit"
+        data-ouiicon-type="user"
+      />
+    </span>
     <span
       class="ouiButtonEmpty__text"
     />
@@ -263,6 +311,9 @@ exports[`OuiButtonEmpty props isDisabled is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     />
@@ -279,6 +330,9 @@ exports[`OuiButtonEmpty props isDisabled renders a button even when href is defi
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     />
@@ -295,6 +349,9 @@ exports[`OuiButtonEmpty props isDisabled renders if passed simply as disabled 1`
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     />
@@ -312,8 +369,12 @@ exports[`OuiButtonEmpty props isLoading is rendered 1`] = `
     class="ouiButtonContent ouiButtonEmpty__content"
   >
     <span
-      class="ouiLoadingSpinner ouiLoadingSpinner--medium ouiButtonContent__spinner"
-    />
+      class=""
+    >
+      <span
+        class="ouiLoadingSpinner ouiLoadingSpinner--medium ouiButtonContent__spinner"
+      />
+    </span>
     <span
       class="ouiButtonEmpty__text"
     />
@@ -330,6 +391,9 @@ exports[`OuiButtonEmpty props isSelected is rendered as false 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     />
@@ -346,6 +410,9 @@ exports[`OuiButtonEmpty props isSelected is rendered as true 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     />
@@ -361,6 +428,9 @@ exports[`OuiButtonEmpty props size l is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     />
@@ -376,6 +446,9 @@ exports[`OuiButtonEmpty props size s is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     />
@@ -391,6 +464,9 @@ exports[`OuiButtonEmpty props size xs is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     />
@@ -406,6 +482,11 @@ exports[`OuiButtonEmpty props textProps is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      aria-label="aria-label"
+      class=""
+      data-test-subj="test subject string"
+    />
     <span
       aria-label="aria-label"
       class="ouiButtonEmpty__text testClass1 testClass2"
diff --git a/src/components/button/button_group/__snapshots__/button_group.test.tsx.snap b/src/components/button/button_group/__snapshots__/button_group.test.tsx.snap
index 54c1542442..fde35c1a7d 100644
--- a/src/components/button/button_group/__snapshots__/button_group.test.tsx.snap
+++ b/src/components/button/button_group/__snapshots__/button_group.test.tsx.snap
@@ -24,10 +24,14 @@ exports[`OuiButtonGroup button props buttonSize compressed is rendered for multi
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -46,10 +50,14 @@ exports[`OuiButtonGroup button props buttonSize compressed is rendered for multi
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -69,10 +77,14 @@ exports[`OuiButtonGroup button props buttonSize compressed is rendered for multi
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -106,10 +118,14 @@ exports[`OuiButtonGroup button props buttonSize compressed is rendered for singl
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -132,10 +148,14 @@ exports[`OuiButtonGroup button props buttonSize compressed is rendered for singl
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -162,10 +182,14 @@ exports[`OuiButtonGroup button props buttonSize compressed is rendered for singl
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -201,10 +225,14 @@ exports[`OuiButtonGroup button props buttonSize m is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -223,10 +251,14 @@ exports[`OuiButtonGroup button props buttonSize m is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -246,10 +278,14 @@ exports[`OuiButtonGroup button props buttonSize m is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -283,10 +319,14 @@ exports[`OuiButtonGroup button props buttonSize m is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -309,10 +349,14 @@ exports[`OuiButtonGroup button props buttonSize m is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -339,10 +383,14 @@ exports[`OuiButtonGroup button props buttonSize m is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -378,10 +426,14 @@ exports[`OuiButtonGroup button props buttonSize s is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -400,10 +452,14 @@ exports[`OuiButtonGroup button props buttonSize s is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -423,10 +479,14 @@ exports[`OuiButtonGroup button props buttonSize s is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -460,10 +520,14 @@ exports[`OuiButtonGroup button props buttonSize s is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -486,10 +550,14 @@ exports[`OuiButtonGroup button props buttonSize s is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -516,10 +584,14 @@ exports[`OuiButtonGroup button props buttonSize s is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -555,10 +627,14 @@ exports[`OuiButtonGroup button props color accent is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -577,10 +653,14 @@ exports[`OuiButtonGroup button props color accent is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -600,10 +680,14 @@ exports[`OuiButtonGroup button props color accent is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -637,10 +721,14 @@ exports[`OuiButtonGroup button props color accent is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -663,10 +751,14 @@ exports[`OuiButtonGroup button props color accent is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -693,10 +785,14 @@ exports[`OuiButtonGroup button props color accent is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -732,10 +828,14 @@ exports[`OuiButtonGroup button props color danger is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -754,10 +854,14 @@ exports[`OuiButtonGroup button props color danger is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -777,10 +881,14 @@ exports[`OuiButtonGroup button props color danger is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -814,10 +922,14 @@ exports[`OuiButtonGroup button props color danger is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -840,10 +952,14 @@ exports[`OuiButtonGroup button props color danger is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -870,10 +986,14 @@ exports[`OuiButtonGroup button props color danger is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -909,10 +1029,14 @@ exports[`OuiButtonGroup button props color ghost is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -931,10 +1055,14 @@ exports[`OuiButtonGroup button props color ghost is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -954,10 +1082,14 @@ exports[`OuiButtonGroup button props color ghost is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -991,10 +1123,14 @@ exports[`OuiButtonGroup button props color ghost is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1017,10 +1153,14 @@ exports[`OuiButtonGroup button props color ghost is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1047,10 +1187,14 @@ exports[`OuiButtonGroup button props color ghost is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1086,10 +1230,14 @@ exports[`OuiButtonGroup button props color primary is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1108,10 +1256,14 @@ exports[`OuiButtonGroup button props color primary is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1131,10 +1283,14 @@ exports[`OuiButtonGroup button props color primary is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1168,10 +1324,14 @@ exports[`OuiButtonGroup button props color primary is rendered for single 1`] =
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1194,10 +1354,14 @@ exports[`OuiButtonGroup button props color primary is rendered for single 1`] =
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1224,10 +1388,14 @@ exports[`OuiButtonGroup button props color primary is rendered for single 1`] =
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1263,10 +1431,14 @@ exports[`OuiButtonGroup button props color secondary is rendered for multi 1`] =
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1285,10 +1457,14 @@ exports[`OuiButtonGroup button props color secondary is rendered for multi 1`] =
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1308,10 +1484,14 @@ exports[`OuiButtonGroup button props color secondary is rendered for multi 1`] =
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1345,10 +1525,14 @@ exports[`OuiButtonGroup button props color secondary is rendered for single 1`]
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1371,10 +1555,14 @@ exports[`OuiButtonGroup button props color secondary is rendered for single 1`]
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1401,10 +1589,14 @@ exports[`OuiButtonGroup button props color secondary is rendered for single 1`]
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1440,10 +1632,14 @@ exports[`OuiButtonGroup button props color success is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1462,10 +1658,14 @@ exports[`OuiButtonGroup button props color success is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1485,10 +1685,14 @@ exports[`OuiButtonGroup button props color success is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1522,10 +1726,14 @@ exports[`OuiButtonGroup button props color success is rendered for single 1`] =
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1548,10 +1756,14 @@ exports[`OuiButtonGroup button props color success is rendered for single 1`] =
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1578,10 +1790,14 @@ exports[`OuiButtonGroup button props color success is rendered for single 1`] =
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1617,10 +1833,14 @@ exports[`OuiButtonGroup button props color text is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1639,10 +1859,14 @@ exports[`OuiButtonGroup button props color text is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1662,10 +1886,14 @@ exports[`OuiButtonGroup button props color text is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1699,10 +1927,14 @@ exports[`OuiButtonGroup button props color text is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1725,10 +1957,14 @@ exports[`OuiButtonGroup button props color text is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1755,10 +1991,14 @@ exports[`OuiButtonGroup button props color text is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1794,10 +2034,14 @@ exports[`OuiButtonGroup button props color warning is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1816,10 +2060,14 @@ exports[`OuiButtonGroup button props color warning is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1839,10 +2087,14 @@ exports[`OuiButtonGroup button props color warning is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1876,10 +2128,14 @@ exports[`OuiButtonGroup button props color warning is rendered for single 1`] =
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1902,10 +2158,14 @@ exports[`OuiButtonGroup button props color warning is rendered for single 1`] =
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1932,10 +2192,14 @@ exports[`OuiButtonGroup button props color warning is rendered for single 1`] =
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1973,10 +2237,14 @@ exports[`OuiButtonGroup button props isDisabled is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -1996,10 +2264,14 @@ exports[`OuiButtonGroup button props isDisabled is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -2019,10 +2291,14 @@ exports[`OuiButtonGroup button props isDisabled is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -2060,10 +2336,14 @@ exports[`OuiButtonGroup button props isDisabled is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -2083,10 +2363,14 @@ exports[`OuiButtonGroup button props isDisabled is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -2106,10 +2390,14 @@ exports[`OuiButtonGroup button props isDisabled is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -2145,10 +2433,14 @@ exports[`OuiButtonGroup button props isFullWidth is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -2167,10 +2459,14 @@ exports[`OuiButtonGroup button props isFullWidth is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -2190,10 +2486,14 @@ exports[`OuiButtonGroup button props isFullWidth is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -2227,10 +2527,14 @@ exports[`OuiButtonGroup button props isFullWidth is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -2253,10 +2557,14 @@ exports[`OuiButtonGroup button props isFullWidth is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -2283,10 +2591,14 @@ exports[`OuiButtonGroup button props isFullWidth is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -2322,10 +2634,14 @@ exports[`OuiButtonGroup button props isIconOnly is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiScreenReaderOnly"
         >
@@ -2344,10 +2660,14 @@ exports[`OuiButtonGroup button props isIconOnly is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiScreenReaderOnly"
         >
@@ -2367,10 +2687,14 @@ exports[`OuiButtonGroup button props isIconOnly is rendered for multi 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiScreenReaderOnly"
         >
@@ -2404,10 +2728,14 @@ exports[`OuiButtonGroup button props isIconOnly is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiScreenReaderOnly"
         >
@@ -2430,10 +2758,14 @@ exports[`OuiButtonGroup button props isIconOnly is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiScreenReaderOnly"
         >
@@ -2460,10 +2792,14 @@ exports[`OuiButtonGroup button props isIconOnly is rendered for single 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiScreenReaderOnly"
         >
@@ -2497,10 +2833,14 @@ exports[`OuiButtonGroup button props selection idSelected is rendered for single
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -2524,10 +2864,14 @@ exports[`OuiButtonGroup button props selection idSelected is rendered for single
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -2554,10 +2898,14 @@ exports[`OuiButtonGroup button props selection idSelected is rendered for single
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -2593,10 +2941,14 @@ exports[`OuiButtonGroup button props selection idToSelectedMap is rendered for m
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -2615,10 +2967,14 @@ exports[`OuiButtonGroup button props selection idToSelectedMap is rendered for m
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -2638,10 +2994,14 @@ exports[`OuiButtonGroup button props selection idToSelectedMap is rendered for m
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -2679,10 +3039,14 @@ exports[`OuiButtonGroup type multi is rendered 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -2701,10 +3065,14 @@ exports[`OuiButtonGroup type multi is rendered 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -2724,10 +3092,14 @@ exports[`OuiButtonGroup type multi is rendered 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -2763,10 +3135,14 @@ exports[`OuiButtonGroup type single is rendered 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -2789,10 +3165,14 @@ exports[`OuiButtonGroup type single is rendered 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
@@ -2819,10 +3199,14 @@ exports[`OuiButtonGroup type single is rendered 1`] = `
         class="ouiButtonContent ouiButton__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="bolt"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="bolt"
+          />
+        </span>
         <span
           class="ouiButton__text ouiButtonGroupButton__textShift"
         >
diff --git a/src/components/card/__snapshots__/card.test.tsx.snap b/src/components/card/__snapshots__/card.test.tsx.snap
index f159fb3421..104d7af26d 100644
--- a/src/components/card/__snapshots__/card.test.tsx.snap
+++ b/src/components/card/__snapshots__/card.test.tsx.snap
@@ -70,6 +70,9 @@ exports[`OuiCard horizontal selectable 1`] = `
     <span
       class="ouiButtonContent ouiButtonEmpty__content"
     >
+      <span
+        class=""
+      />
       <span
         class="ouiButtonEmpty__text"
       >
@@ -785,6 +788,9 @@ exports[`OuiCard props selectable 1`] = `
     <span
       class="ouiButtonContent ouiButtonEmpty__content"
     >
+      <span
+        class=""
+      />
       <span
         class="ouiButtonEmpty__text"
       >
diff --git a/src/components/card/__snapshots__/card_select.test.tsx.snap b/src/components/card/__snapshots__/card_select.test.tsx.snap
index 74d802652e..d1199b1a54 100644
--- a/src/components/card/__snapshots__/card_select.test.tsx.snap
+++ b/src/components/card/__snapshots__/card_select.test.tsx.snap
@@ -12,6 +12,9 @@ exports[`OuiCardSelect is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     >
@@ -31,6 +34,9 @@ exports[`OuiCardSelect props can override color 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     >
@@ -50,6 +56,9 @@ exports[`OuiCardSelect props can override text 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     >
@@ -70,6 +79,9 @@ exports[`OuiCardSelect props isDisabled 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     >
@@ -90,10 +102,14 @@ exports[`OuiCardSelect props isSelected 1`] = `
     class="ouiButtonContent ouiButtonEmpty__content"
   >
     <span
-      class="ouiButtonContent__icon"
-      color="inherit"
-      data-ouiicon-type="check"
-    />
+      class=""
+    >
+      <span
+        class="ouiButtonContent__icon"
+        color="inherit"
+        data-ouiicon-type="check"
+      />
+    </span>
     <span
       class="ouiButtonEmpty__text"
     >
diff --git a/src/components/control_bar/__snapshots__/control_bar.test.tsx.snap b/src/components/control_bar/__snapshots__/control_bar.test.tsx.snap
index cadd4fe012..16cf636d64 100644
--- a/src/components/control_bar/__snapshots__/control_bar.test.tsx.snap
+++ b/src/components/control_bar/__snapshots__/control_bar.test.tsx.snap
@@ -54,6 +54,9 @@ exports[`OuiControlBar is rendered 1`] = `
       <span
         class="ouiButtonContent ouiButton__content"
       >
+        <span
+          class=""
+        />
         <span
           class="ouiButton__text"
         >
@@ -200,6 +203,9 @@ exports[`OuiControlBar props leftOffset is rendered 1`] = `
                 <span
                   class="ouiButtonContent ouiButton__content"
                 >
+                  <span
+                    class=""
+                  />
                   <span
                     class="ouiButton__text"
                   >
@@ -360,6 +366,9 @@ exports[`OuiControlBar props leftOffset is rendered 1`] = `
                     <span
                       className="ouiButtonContent ouiButton__content"
                     >
+                      <span
+                        className=""
+                      />
                       <span
                         className="ouiButton__text"
                       >
@@ -540,6 +549,9 @@ exports[`OuiControlBar props maxHeight is rendered 1`] = `
                 <span
                   class="ouiButtonContent ouiButton__content"
                 >
+                  <span
+                    class=""
+                  />
                   <span
                     class="ouiButton__text"
                   >
@@ -700,6 +712,9 @@ exports[`OuiControlBar props maxHeight is rendered 1`] = `
                     <span
                       className="ouiButtonContent ouiButton__content"
                     >
+                      <span
+                        className=""
+                      />
                       <span
                         className="ouiButton__text"
                       >
@@ -879,6 +894,9 @@ exports[`OuiControlBar props mobile is rendered 1`] = `
                 <span
                   class="ouiButtonContent ouiButton__content"
                 >
+                  <span
+                    class=""
+                  />
                   <span
                     class="ouiButton__text"
                   >
@@ -1039,6 +1057,9 @@ exports[`OuiControlBar props mobile is rendered 1`] = `
                     <span
                       className="ouiButtonContent ouiButton__content"
                     >
+                      <span
+                        className=""
+                      />
                       <span
                         className="ouiButton__text"
                       >
@@ -1282,6 +1303,9 @@ exports[`OuiControlBar props position is rendered 1`] = `
                 <span
                   className="ouiButtonContent ouiButton__content"
                 >
+                  <span
+                    className=""
+                  />
                   <span
                     className="ouiButton__text"
                   >
@@ -1446,6 +1470,9 @@ exports[`OuiControlBar props rightOffset is rendered 1`] = `
                 <span
                   class="ouiButtonContent ouiButton__content"
                 >
+                  <span
+                    class=""
+                  />
                   <span
                     class="ouiButton__text"
                   >
@@ -1606,6 +1633,9 @@ exports[`OuiControlBar props rightOffset is rendered 1`] = `
                     <span
                       className="ouiButtonContent ouiButton__content"
                     >
+                      <span
+                        className=""
+                      />
                       <span
                         className="ouiButton__text"
                       >
@@ -1785,6 +1815,9 @@ exports[`OuiControlBar props showContent is rendered 1`] = `
                 <span
                   class="ouiButtonContent ouiButton__content"
                 >
+                  <span
+                    class=""
+                  />
                   <span
                     class="ouiButton__text"
                   >
@@ -1950,6 +1983,9 @@ exports[`OuiControlBar props showContent is rendered 1`] = `
                     <span
                       className="ouiButtonContent ouiButton__content"
                     >
+                      <span
+                        className=""
+                      />
                       <span
                         className="ouiButton__text"
                       >
@@ -2134,6 +2170,9 @@ exports[`OuiControlBar props size is rendered 1`] = `
                 <span
                   class="ouiButtonContent ouiButton__content"
                 >
+                  <span
+                    class=""
+                  />
                   <span
                     class="ouiButton__text"
                   >
@@ -2294,6 +2333,9 @@ exports[`OuiControlBar props size is rendered 1`] = `
                     <span
                       className="ouiButtonContent ouiButton__content"
                     >
+                      <span
+                        className=""
+                      />
                       <span
                         className="ouiButton__text"
                       >
diff --git a/src/components/datagrid/__snapshots__/data_grid.test.tsx.snap b/src/components/datagrid/__snapshots__/data_grid.test.tsx.snap
index bb537ef767..5f4cc9eb1a 100644
--- a/src/components/datagrid/__snapshots__/data_grid.test.tsx.snap
+++ b/src/components/datagrid/__snapshots__/data_grid.test.tsx.snap
@@ -22,10 +22,14 @@ exports[`OuiDataGrid pagination renders 1`] = `
             class="ouiButtonContent ouiButtonContent--iconRight ouiButtonEmpty__content"
           >
             <span
-              class="ouiButtonContent__icon"
-              color="inherit"
-              data-ouiicon-type="arrowDown"
-            />
+              class=""
+            >
+              <span
+                class="ouiButtonContent__icon"
+                color="inherit"
+                data-ouiicon-type="arrowDown"
+              />
+            </span>
             <span
               class="ouiButtonEmpty__text"
             >
@@ -76,6 +80,9 @@ exports[`OuiDataGrid pagination renders 1`] = `
             <span
               class="ouiButtonContent ouiButtonEmpty__content"
             >
+              <span
+                class=""
+              />
               <span
                 class="ouiButtonEmpty__text"
               >
@@ -99,6 +106,9 @@ exports[`OuiDataGrid pagination renders 1`] = `
             <span
               class="ouiButtonContent ouiButtonEmpty__content"
             >
+              <span
+                class=""
+              />
               <span
                 class="ouiButtonEmpty__text"
               >
@@ -959,10 +969,14 @@ Array [
                 class="ouiButtonContent ouiButtonEmpty__content"
               >
                 <span
-                  class="ouiButtonContent__icon"
-                  color="inherit"
-                  data-ouiicon-type="listAdd"
-                />
+                  class=""
+                >
+                  <span
+                    class="ouiButtonContent__icon"
+                    color="inherit"
+                    data-ouiicon-type="listAdd"
+                  />
+                </span>
                 <span
                   class="ouiButtonEmpty__text"
                 >
@@ -988,10 +1002,14 @@ Array [
                 class="ouiButtonContent ouiButtonEmpty__content"
               >
                 <span
-                  class="ouiButtonContent__icon"
-                  color="inherit"
-                  data-ouiicon-type="tableDensityExpanded"
-                />
+                  class=""
+                >
+                  <span
+                    class="ouiButtonContent__icon"
+                    color="inherit"
+                    data-ouiicon-type="tableDensityExpanded"
+                  />
+                </span>
                 <span
                   class="ouiButtonEmpty__text"
                 >
@@ -1010,10 +1028,14 @@ Array [
             class="ouiButtonContent ouiButtonEmpty__content"
           >
             <span
-              class="ouiButtonContent__icon"
-              color="inherit"
-              data-ouiicon-type="fullScreen"
-            />
+              class=""
+            >
+              <span
+                class="ouiButtonContent__icon"
+                color="inherit"
+                data-ouiicon-type="fullScreen"
+              />
+            </span>
             <span
               class="ouiButtonEmpty__text"
             >
@@ -1325,10 +1347,14 @@ Array [
                 class="ouiButtonContent ouiButtonEmpty__content"
               >
                 <span
-                  class="ouiButtonContent__icon"
-                  color="inherit"
-                  data-ouiicon-type="listAdd"
-                />
+                  class=""
+                >
+                  <span
+                    class="ouiButtonContent__icon"
+                    color="inherit"
+                    data-ouiicon-type="listAdd"
+                  />
+                </span>
                 <span
                   class="ouiButtonEmpty__text"
                 >
@@ -1354,10 +1380,14 @@ Array [
                 class="ouiButtonContent ouiButtonEmpty__content"
               >
                 <span
-                  class="ouiButtonContent__icon"
-                  color="inherit"
-                  data-ouiicon-type="tableDensityExpanded"
-                />
+                  class=""
+                >
+                  <span
+                    class="ouiButtonContent__icon"
+                    color="inherit"
+                    data-ouiicon-type="tableDensityExpanded"
+                  />
+                </span>
                 <span
                   class="ouiButtonEmpty__text"
                 >
@@ -1376,10 +1406,14 @@ Array [
             class="ouiButtonContent ouiButtonEmpty__content"
           >
             <span
-              class="ouiButtonContent__icon"
-              color="inherit"
-              data-ouiicon-type="fullScreen"
-            />
+              class=""
+            >
+              <span
+                class="ouiButtonContent__icon"
+                color="inherit"
+                data-ouiicon-type="fullScreen"
+              />
+            </span>
             <span
               class="ouiButtonEmpty__text"
             >
@@ -1988,10 +2022,14 @@ Array [
                 class="ouiButtonContent ouiButtonEmpty__content"
               >
                 <span
-                  class="ouiButtonContent__icon"
-                  color="inherit"
-                  data-ouiicon-type="listAdd"
-                />
+                  class=""
+                >
+                  <span
+                    class="ouiButtonContent__icon"
+                    color="inherit"
+                    data-ouiicon-type="listAdd"
+                  />
+                </span>
                 <span
                   class="ouiButtonEmpty__text"
                 >
@@ -2017,10 +2055,14 @@ Array [
                 class="ouiButtonContent ouiButtonEmpty__content"
               >
                 <span
-                  class="ouiButtonContent__icon"
-                  color="inherit"
-                  data-ouiicon-type="tableDensityExpanded"
-                />
+                  class=""
+                >
+                  <span
+                    class="ouiButtonContent__icon"
+                    color="inherit"
+                    data-ouiicon-type="tableDensityExpanded"
+                  />
+                </span>
                 <span
                   class="ouiButtonEmpty__text"
                 >
@@ -2039,10 +2081,14 @@ Array [
             class="ouiButtonContent ouiButtonEmpty__content"
           >
             <span
-              class="ouiButtonContent__icon"
-              color="inherit"
-              data-ouiicon-type="fullScreen"
-            />
+              class=""
+            >
+              <span
+                class="ouiButtonContent__icon"
+                color="inherit"
+                data-ouiicon-type="fullScreen"
+              />
+            </span>
             <span
               class="ouiButtonEmpty__text"
             >
@@ -2353,10 +2399,14 @@ Array [
                 class="ouiButtonContent ouiButtonEmpty__content"
               >
                 <span
-                  class="ouiButtonContent__icon"
-                  color="inherit"
-                  data-ouiicon-type="listAdd"
-                />
+                  class=""
+                >
+                  <span
+                    class="ouiButtonContent__icon"
+                    color="inherit"
+                    data-ouiicon-type="listAdd"
+                  />
+                </span>
                 <span
                   class="ouiButtonEmpty__text"
                 >
@@ -2382,10 +2432,14 @@ Array [
                 class="ouiButtonContent ouiButtonEmpty__content"
               >
                 <span
-                  class="ouiButtonContent__icon"
-                  color="inherit"
-                  data-ouiicon-type="tableDensityExpanded"
-                />
+                  class=""
+                >
+                  <span
+                    class="ouiButtonContent__icon"
+                    color="inherit"
+                    data-ouiicon-type="tableDensityExpanded"
+                  />
+                </span>
                 <span
                   class="ouiButtonEmpty__text"
                 >
@@ -2404,10 +2458,14 @@ Array [
             class="ouiButtonContent ouiButtonEmpty__content"
           >
             <span
-              class="ouiButtonContent__icon"
-              color="inherit"
-              data-ouiicon-type="fullScreen"
-            />
+              class=""
+            >
+              <span
+                class="ouiButtonContent__icon"
+                color="inherit"
+                data-ouiicon-type="fullScreen"
+              />
+            </span>
             <span
               class="ouiButtonEmpty__text"
             >
diff --git a/src/components/filter_group/__snapshots__/filter_button.test.tsx.snap b/src/components/filter_group/__snapshots__/filter_button.test.tsx.snap
index 14bf60b710..00dbecfad9 100644
--- a/src/components/filter_group/__snapshots__/filter_button.test.tsx.snap
+++ b/src/components/filter_group/__snapshots__/filter_button.test.tsx.snap
@@ -10,6 +10,9 @@ exports[`OuiFilterButton is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButtonContent--iconRight ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     >
@@ -29,6 +32,9 @@ exports[`OuiFilterButton props grow can be turned off 1`] = `
   <span
     class="ouiButtonContent ouiButtonContent--iconRight ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     >
@@ -49,10 +55,14 @@ exports[`OuiFilterButton props iconType and iconSide is rendered 1`] = `
     class="ouiButtonContent ouiButtonContent--iconRight ouiButtonEmpty__content"
   >
     <span
-      class="ouiButtonContent__icon"
-      color="inherit"
-      data-ouiicon-type="user"
-    />
+      class=""
+    >
+      <span
+        class="ouiButtonContent__icon"
+        color="inherit"
+        data-ouiicon-type="user"
+      />
+    </span>
     <span
       class="ouiButtonEmpty__text"
     >
@@ -73,6 +83,9 @@ exports[`OuiFilterButton props isDisabled is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButtonContent--iconRight ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     >
@@ -92,6 +105,9 @@ exports[`OuiFilterButton props isSelected is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButtonContent--iconRight ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     >
@@ -111,6 +127,9 @@ exports[`OuiFilterButton props numActiveFilters and hasActiveFilters is rendered
   <span
     class="ouiButtonContent ouiButtonContent--iconRight ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text ouiFilterButton__text-hasNotification"
     >
@@ -136,6 +155,9 @@ exports[`OuiFilterButton props numFilters is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButtonContent--iconRight ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text ouiFilterButton__text-hasNotification"
     >
@@ -161,6 +183,9 @@ exports[`OuiFilterButton props type is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButtonContent--iconRight ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     >
@@ -180,6 +205,9 @@ exports[`OuiFilterButton props withNext is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButtonContent--iconRight ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     >
@@ -201,6 +229,9 @@ exports[`OuiFilterButton renders zero properly 1`] = `
   <span
     class="ouiButtonContent ouiButtonContent--iconRight ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text ouiFilterButton__text-hasNotification"
     >
diff --git a/src/components/header/header_links/__snapshots__/header_link.test.tsx.snap b/src/components/header/header_links/__snapshots__/header_link.test.tsx.snap
index 4ffac40d76..36fa776cef 100644
--- a/src/components/header/header_links/__snapshots__/header_link.test.tsx.snap
+++ b/src/components/header/header_links/__snapshots__/header_link.test.tsx.snap
@@ -8,6 +8,9 @@ exports[`OuiHeaderLink can render as specific color 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     />
@@ -25,6 +28,9 @@ exports[`OuiHeaderLink is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     />
@@ -40,6 +46,9 @@ exports[`OuiHeaderLink is rendered as active 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     />
diff --git a/src/components/header/header_links/__snapshots__/header_links.test.tsx.snap b/src/components/header/header_links/__snapshots__/header_links.test.tsx.snap
index ec396ba4cb..b38cece33e 100644
--- a/src/components/header/header_links/__snapshots__/header_links.test.tsx.snap
+++ b/src/components/header/header_links/__snapshots__/header_links.test.tsx.snap
@@ -86,6 +86,9 @@ exports[`OuiHeaderLinks popover props is rendered 1`] = `
         <span
           class="ouiButtonContent ouiButtonEmpty__content"
         >
+          <span
+            class=""
+          />
           <span
             class="ouiButtonEmpty__text"
           >
diff --git a/src/components/header/header_section/__snapshots__/header_section_item_button.test.tsx.snap b/src/components/header/header_section/__snapshots__/header_section_item_button.test.tsx.snap
index 3e6c08cefc..0f78888f20 100644
--- a/src/components/header/header_section/__snapshots__/header_section_item_button.test.tsx.snap
+++ b/src/components/header/header_section/__snapshots__/header_section_item_button.test.tsx.snap
@@ -10,6 +10,9 @@ exports[`OuiHeaderSectionItemButton is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     >
@@ -30,6 +33,9 @@ exports[`OuiHeaderSectionItemButton renders a link 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     >
@@ -49,6 +55,9 @@ exports[`OuiHeaderSectionItemButton renders children 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     >
@@ -72,6 +81,9 @@ exports[`OuiHeaderSectionItemButton renders notification as a badge 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     >
@@ -96,6 +108,9 @@ exports[`OuiHeaderSectionItemButton renders notification as a dot 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     >
@@ -120,6 +135,9 @@ exports[`OuiHeaderSectionItemButton renders notification color 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     >
diff --git a/src/components/markdown_editor/__snapshots__/markdown_editor.test.tsx.snap b/src/components/markdown_editor/__snapshots__/markdown_editor.test.tsx.snap
index def0944bf8..f73c2ca100 100644
--- a/src/components/markdown_editor/__snapshots__/markdown_editor.test.tsx.snap
+++ b/src/components/markdown_editor/__snapshots__/markdown_editor.test.tsx.snap
@@ -173,10 +173,14 @@ exports[`OuiMarkdownEditor is rendered 1`] = `
         class="ouiButtonContent ouiButtonEmpty__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="eye"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="eye"
+          />
+        </span>
         <span
           class="ouiButtonEmpty__text"
         >
@@ -403,10 +407,14 @@ exports[`OuiMarkdownEditor props autoExpandPreview is rendered with false 1`] =
         class="ouiButtonContent ouiButtonEmpty__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="eye"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="eye"
+          />
+        </span>
         <span
           class="ouiButtonEmpty__text"
         >
@@ -633,10 +641,14 @@ exports[`OuiMarkdownEditor props height is rendered in full mode 1`] = `
         class="ouiButtonContent ouiButtonEmpty__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="eye"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="eye"
+          />
+        </span>
         <span
           class="ouiButtonEmpty__text"
         >
@@ -863,10 +875,14 @@ exports[`OuiMarkdownEditor props height is rendered with a custom size 1`] = `
         class="ouiButtonContent ouiButtonEmpty__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="eye"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="eye"
+          />
+        </span>
         <span
           class="ouiButtonEmpty__text"
         >
@@ -1093,10 +1109,14 @@ exports[`OuiMarkdownEditor props maxHeight is rendered with a custom size 1`] =
         class="ouiButtonContent ouiButtonEmpty__content"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="eye"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="eye"
+          />
+        </span>
         <span
           class="ouiButtonEmpty__text"
         >
diff --git a/src/components/modal/__snapshots__/confirm_modal.test.tsx.snap b/src/components/modal/__snapshots__/confirm_modal.test.tsx.snap
index 0514d28db0..2f64b733dd 100644
--- a/src/components/modal/__snapshots__/confirm_modal.test.tsx.snap
+++ b/src/components/modal/__snapshots__/confirm_modal.test.tsx.snap
@@ -77,6 +77,9 @@ Array [
             <span
               class="ouiButtonContent ouiButtonEmpty__content"
             >
+              <span
+                class=""
+              />
               <span
                 class="ouiButtonEmpty__text"
               >
@@ -92,6 +95,9 @@ Array [
             <span
               class="ouiButtonContent ouiButton__content"
             >
+              <span
+                class=""
+              />
               <span
                 class="ouiButton__text"
               >
@@ -174,6 +180,9 @@ Array [
             <span
               class="ouiButtonContent ouiButtonEmpty__content"
             >
+              <span
+                class=""
+              />
               <span
                 class="ouiButtonEmpty__text"
               >
@@ -189,6 +198,9 @@ Array [
             <span
               class="ouiButtonContent ouiButton__content"
             >
+              <span
+                class=""
+              />
               <span
                 class="ouiButton__text"
               >
diff --git a/src/components/notification/__snapshots__/notification_event.test.tsx.snap b/src/components/notification/__snapshots__/notification_event.test.tsx.snap
index 1ff2373ead..9aa7efd2da 100644
--- a/src/components/notification/__snapshots__/notification_event.test.tsx.snap
+++ b/src/components/notification/__snapshots__/notification_event.test.tsx.snap
@@ -664,6 +664,9 @@ exports[`OuiNotificationEvent props primaryAction is rendered 1`] = `
         <span
           class="ouiButtonContent ouiButtonEmpty__content"
         >
+          <span
+            class=""
+          />
           <span
             class="ouiButtonEmpty__text"
           >
@@ -748,10 +751,14 @@ exports[`OuiNotificationEvent props primaryActionProps is rendered 1`] = `
           class="ouiButtonContent ouiButtonEmpty__content"
         >
           <span
-            class="ouiButtonContent__icon"
-            color="inherit"
-            data-ouiicon-type="download"
-          />
+            class=""
+          >
+            <span
+              class="ouiButtonContent__icon"
+              color="inherit"
+              data-ouiicon-type="download"
+            />
+          </span>
           <span
             class="ouiButtonEmpty__text"
           >
diff --git a/src/components/pagination/__snapshots__/pagination.test.tsx.snap b/src/components/pagination/__snapshots__/pagination.test.tsx.snap
index e84e2f5aca..8d2ec5d4be 100644
--- a/src/components/pagination/__snapshots__/pagination.test.tsx.snap
+++ b/src/components/pagination/__snapshots__/pagination.test.tsx.snap
@@ -35,6 +35,9 @@ exports[`OuiPagination is rendered 1`] = `
         <span
           class="ouiButtonContent ouiButtonEmpty__content"
         >
+          <span
+            class=""
+          />
           <span
             class="ouiButtonEmpty__text"
           >
diff --git a/src/components/pagination/__snapshots__/pagination_button.test.tsx.snap b/src/components/pagination/__snapshots__/pagination_button.test.tsx.snap
index 5ddec27103..621deb10a8 100644
--- a/src/components/pagination/__snapshots__/pagination_button.test.tsx.snap
+++ b/src/components/pagination/__snapshots__/pagination_button.test.tsx.snap
@@ -10,6 +10,9 @@ exports[`OuiPaginationButton is rendered 1`] = `
   <span
     class="ouiButtonContent ouiButtonEmpty__content"
   >
+    <span
+      class=""
+    />
     <span
       class="ouiButtonEmpty__text"
     >
diff --git a/src/components/side_nav/__snapshots__/side_nav.test.tsx.snap b/src/components/side_nav/__snapshots__/side_nav.test.tsx.snap
index 6d5257846b..f712c0e019 100644
--- a/src/components/side_nav/__snapshots__/side_nav.test.tsx.snap
+++ b/src/components/side_nav/__snapshots__/side_nav.test.tsx.snap
@@ -533,10 +533,14 @@ exports[`OuiSideNav props mobileBreakpoints can be adjusted is rendered 1`] = `
         class="ouiButtonContent ouiButtonContent--iconRight ouiButtonEmpty__content ouiSideNav__mobileToggleContent"
       >
         <span
-          class="ouiButtonContent__icon"
-          color="inherit"
-          data-ouiicon-type="apps"
-        />
+          class=""
+        >
+          <span
+            class="ouiButtonContent__icon"
+            color="inherit"
+            data-ouiicon-type="apps"
+          />
+        </span>
         <span
           class="ouiButtonEmpty__text ouiSideNav__mobileToggleText"
         />
diff --git a/src/components/table/mobile/__snapshots__/table_sort_mobile.test.tsx.snap b/src/components/table/mobile/__snapshots__/table_sort_mobile.test.tsx.snap
index 7e45415d31..223c306f84 100644
--- a/src/components/table/mobile/__snapshots__/table_sort_mobile.test.tsx.snap
+++ b/src/components/table/mobile/__snapshots__/table_sort_mobile.test.tsx.snap
@@ -19,10 +19,14 @@ exports[`OuiTableSortMobile is rendered 1`] = `
           class="ouiButtonContent ouiButtonContent--iconRight ouiButtonEmpty__content"
         >
           <span
-            class="ouiButtonContent__icon"
-            color="inherit"
-            data-ouiicon-type="arrowDown"
-          />
+            class=""
+          >
+            <span
+              class="ouiButtonContent__icon"
+              color="inherit"
+              data-ouiicon-type="arrowDown"
+            />
+          </span>
           <span
             class="ouiButtonEmpty__text"
           >
diff --git a/src/components/table/table_pagination/__snapshots__/table_pagination.test.tsx.snap b/src/components/table/table_pagination/__snapshots__/table_pagination.test.tsx.snap
index 70aafd549c..ea68c241cc 100644
--- a/src/components/table/table_pagination/__snapshots__/table_pagination.test.tsx.snap
+++ b/src/components/table/table_pagination/__snapshots__/table_pagination.test.tsx.snap
@@ -22,10 +22,14 @@ exports[`OuiTablePagination is rendered 1`] = `
             class="ouiButtonContent ouiButtonContent--iconRight ouiButtonEmpty__content"
           >
             <span
-              class="ouiButtonContent__icon"
-              color="inherit"
-              data-ouiicon-type="arrowDown"
-            />
+              class=""
+            >
+              <span
+                class="ouiButtonContent__icon"
+                color="inherit"
+                data-ouiicon-type="arrowDown"
+              />
+            </span>
             <span
               class="ouiButtonEmpty__text"
             >
@@ -73,6 +77,9 @@ exports[`OuiTablePagination is rendered 1`] = `
             <span
               class="ouiButtonContent ouiButtonEmpty__content"
             >
+              <span
+                class=""
+              />
               <span
                 class="ouiButtonEmpty__text"
               >
@@ -95,6 +102,9 @@ exports[`OuiTablePagination is rendered 1`] = `
             <span
               class="ouiButtonContent ouiButtonEmpty__content"
             >
+              <span
+                class=""
+              />
               <span
                 class="ouiButtonEmpty__text"
               >
@@ -115,6 +125,9 @@ exports[`OuiTablePagination is rendered 1`] = `
             <span
               class="ouiButtonContent ouiButtonEmpty__content"
             >
+              <span
+                class=""
+              />
               <span
                 class="ouiButtonEmpty__text"
               >
@@ -135,6 +148,9 @@ exports[`OuiTablePagination is rendered 1`] = `
             <span
               class="ouiButtonContent ouiButtonEmpty__content"
             >
+              <span
+                class=""
+              />
               <span
                 class="ouiButtonEmpty__text"
               >
@@ -155,6 +171,9 @@ exports[`OuiTablePagination is rendered 1`] = `
             <span
               class="ouiButtonContent ouiButtonEmpty__content"
             >
+              <span
+                class=""
+              />
               <span
                 class="ouiButtonEmpty__text"
               >
@@ -226,6 +245,9 @@ exports[`OuiTablePagination is rendered when hiding the per page options 1`] = `
             <span
               class="ouiButtonContent ouiButtonEmpty__content"
             >
+              <span
+                class=""
+              />
               <span
                 class="ouiButtonEmpty__text"
               >
@@ -248,6 +270,9 @@ exports[`OuiTablePagination is rendered when hiding the per page options 1`] = `
             <span
               class="ouiButtonContent ouiButtonEmpty__content"
             >
+              <span
+                class=""
+              />
               <span
                 class="ouiButtonEmpty__text"
               >
@@ -268,6 +293,9 @@ exports[`OuiTablePagination is rendered when hiding the per page options 1`] = `
             <span
               class="ouiButtonContent ouiButtonEmpty__content"
             >
+              <span
+                class=""
+              />
               <span
                 class="ouiButtonEmpty__text"
               >
@@ -288,6 +316,9 @@ exports[`OuiTablePagination is rendered when hiding the per page options 1`] = `
             <span
               class="ouiButtonContent ouiButtonEmpty__content"
             >
+              <span
+                class=""
+              />
               <span
                 class="ouiButtonEmpty__text"
               >
@@ -308,6 +339,9 @@ exports[`OuiTablePagination is rendered when hiding the per page options 1`] = `
             <span
               class="ouiButtonContent ouiButtonEmpty__content"
             >
+              <span
+                class=""
+              />
               <span
                 class="ouiButtonEmpty__text"
               >