diff --git a/x-pack/plugins/canvas/public/components/asset_manager/__examples__/__snapshots__/asset.examples.storyshot b/x-pack/plugins/canvas/public/components/asset_manager/__examples__/__snapshots__/asset.examples.storyshot
index 05473f55fabe11..894ee75ab03981 100644
--- a/x-pack/plugins/canvas/public/components/asset_manager/__examples__/__snapshots__/asset.examples.storyshot
+++ b/x-pack/plugins/canvas/public/components/asset_manager/__examples__/__snapshots__/asset.examples.storyshot
@@ -17,20 +17,24 @@ exports[`Storyshots components/Asset airplane 1`] = `
       <div
         className="canvasAsset__thumb canvasCheckered"
       >
-        <figure
-          className="euiImage canvasAsset__img"
-          style={
-            Object {
-              "backgroundImage": "url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1Ni4zMSA1Ni4zMSI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiNmZmY7c3Ryb2tlOiMwMDc4YTA7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlBsYW5lIEljb248L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8xLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMSI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNNDkuNTEsNDguOTMsNDEuMjYsMjIuNTIsNTMuNzYsMTBhNS4yOSw1LjI5LDAsMCwwLTcuNDgtNy40N2wtMTIuNSwxMi41TDcuMzgsNi43OUEuNy43LDAsMCwwLDYuNjksN0wxLjIsMTIuNDVhLjcuNywwLDAsMCwwLDFMMTkuODUsMjlsLTcuMjQsNy4yNC03Ljc0LS42YS43MS43MSwwLDAsMC0uNTMuMkwxLjIxLDM5YS42Ny42NywwLDAsMCwuMDgsMUw5LjQ1LDQ2bC4wNywwYy4xMS4xMy4yMi4yNi4zNC4zOHMuMjUuMjMuMzguMzRhLjM2LjM2LDAsMCwwLDAsLjA3TDE2LjMzLDU1YS42OC42OCwwLDAsMCwxLC4wN0wyMC40OSw1MmEuNjcuNjcsMCwwLDAsLjE5LS41NGwtLjU5LTcuNzQsNy4yNC03LjI0TDQyLjg1LDU1LjA2YS42OC42OCwwLDAsMCwxLDBsNS41LTUuNUEuNjYuNjYsMCwwLDAsNDkuNTEsNDguOTNaIi8+PC9nPjwvZz48L3N2Zz4=)",
-            }
-          }
+        <button
+          type="button"
         >
-          <img
-            alt="Asset thumbnail"
-            className="euiImage__img"
-            src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1Ni4zMSA1Ni4zMSI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiNmZmY7c3Ryb2tlOiMwMDc4YTA7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlBsYW5lIEljb248L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8xLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMSI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNNDkuNTEsNDguOTMsNDEuMjYsMjIuNTIsNTMuNzYsMTBhNS4yOSw1LjI5LDAsMCwwLTcuNDgtNy40N2wtMTIuNSwxMi41TDcuMzgsNi43OUEuNy43LDAsMCwwLDYuNjksN0wxLjIsMTIuNDVhLjcuNywwLDAsMCwwLDFMMTkuODUsMjlsLTcuMjQsNy4yNC03Ljc0LS42YS43MS43MSwwLDAsMC0uNTMuMkwxLjIxLDM5YS42Ny42NywwLDAsMCwuMDgsMUw5LjQ1LDQ2bC4wNywwYy4xMS4xMy4yMi4yNi4zNC4zOHMuMjUuMjMuMzguMzRhLjM2LjM2LDAsMCwwLDAsLjA3TDE2LjMzLDU1YS42OC42OCwwLDAsMCwxLC4wN0wyMC40OSw1MmEuNjcuNjcsMCwwLDAsLjE5LS41NGwtLjU5LTcuNzQsNy4yNC03LjI0TDQyLjg1LDU1LjA2YS42OC42OCwwLDAsMCwxLDBsNS41LTUuNUEuNjYuNjYsMCwwLDAsNDkuNTEsNDguOTNaIi8+PC9nPjwvZz48L3N2Zz4="
-          />
-        </figure>
+          <figure
+            className="euiImage canvasAsset__img"
+            style={
+              Object {
+                "backgroundImage": "url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1Ni4zMSA1Ni4zMSI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiNmZmY7c3Ryb2tlOiMwMDc4YTA7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlBsYW5lIEljb248L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8xLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMSI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNNDkuNTEsNDguOTMsNDEuMjYsMjIuNTIsNTMuNzYsMTBhNS4yOSw1LjI5LDAsMCwwLTcuNDgtNy40N2wtMTIuNSwxMi41TDcuMzgsNi43OUEuNy43LDAsMCwwLDYuNjksN0wxLjIsMTIuNDVhLjcuNywwLDAsMCwwLDFMMTkuODUsMjlsLTcuMjQsNy4yNC03Ljc0LS42YS43MS43MSwwLDAsMC0uNTMuMkwxLjIxLDM5YS42Ny42NywwLDAsMCwuMDgsMUw5LjQ1LDQ2bC4wNywwYy4xMS4xMy4yMi4yNi4zNC4zOHMuMjUuMjMuMzguMzRhLjM2LjM2LDAsMCwwLDAsLjA3TDE2LjMzLDU1YS42OC42OCwwLDAsMCwxLC4wN0wyMC40OSw1MmEuNjcuNjcsMCwwLDAsLjE5LS41NGwtLjU5LTcuNzQsNy4yNC03LjI0TDQyLjg1LDU1LjA2YS42OC42OCwwLDAsMCwxLDBsNS41LTUuNUEuNjYuNjYsMCwwLDAsNDkuNTEsNDguOTNaIi8+PC9nPjwvZz48L3N2Zz4=)",
+              }
+            }
+          >
+            <img
+              alt="Asset thumbnail"
+              className="euiImage__img"
+              src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA1Ni4zMSA1Ni4zMSI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiNmZmY7c3Ryb2tlOiMwMDc4YTA7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPlBsYW5lIEljb248L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8xLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMSI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNNDkuNTEsNDguOTMsNDEuMjYsMjIuNTIsNTMuNzYsMTBhNS4yOSw1LjI5LDAsMCwwLTcuNDgtNy40N2wtMTIuNSwxMi41TDcuMzgsNi43OUEuNy43LDAsMCwwLDYuNjksN0wxLjIsMTIuNDVhLjcuNywwLDAsMCwwLDFMMTkuODUsMjlsLTcuMjQsNy4yNC03Ljc0LS42YS43MS43MSwwLDAsMC0uNTMuMkwxLjIxLDM5YS42Ny42NywwLDAsMCwuMDgsMUw5LjQ1LDQ2bC4wNywwYy4xMS4xMy4yMi4yNi4zNC4zOHMuMjUuMjMuMzguMzRhLjM2LjM2LDAsMCwwLDAsLjA3TDE2LjMzLDU1YS42OC42OCwwLDAsMCwxLC4wN0wyMC40OSw1MmEuNjcuNjcsMCwwLDAsLjE5LS41NGwtLjU5LTcuNzQsNy4yNC03LjI0TDQyLjg1LDU1LjA2YS42OC42OCwwLDAsMCwxLDBsNS41LTUuNUEuNjYuNjYsMCwwLDAsNDkuNTEsNDguOTNaIi8+PC9nPjwvZz48L3N2Zz4="
+            />
+          </figure>
+        </button>
       </div>
       <div
         className="euiSpacer euiSpacer--s"
@@ -213,20 +217,24 @@ exports[`Storyshots components/Asset marker 1`] = `
       <div
         className="canvasAsset__thumb canvasCheckered"
       >
-        <figure
-          className="euiImage canvasAsset__img"
-          style={
-            Object {
-              "backgroundImage": "url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzOC4zOSA1Ny41NyI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiNmZmY7c3Ryb2tlOiMwMTliOGY7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPkxvY2F0aW9uIEljb248L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8xLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMSI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNMTkuMTksMUExOC4xOSwxOC4xOSwwLDAsMCwyLjk0LDI3LjM2aDBhMTkuNTEsMTkuNTEsMCwwLDAsMSwxLjc4TDE5LjE5LDU1LjU3LDM0LjM4LDI5LjIxQTE4LjE5LDE4LjE5LDAsMCwwLDE5LjE5LDFabTAsMjMuMjlhNS41Myw1LjUzLDAsMSwxLDUuNTMtNS41M0E1LjUzLDUuNTMsMCwwLDEsMTkuMTksMjQuMjlaIi8+PC9nPjwvZz48L3N2Zz4=)",
-            }
-          }
+        <button
+          type="button"
         >
-          <img
-            alt="Asset thumbnail"
-            className="euiImage__img"
-            src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzOC4zOSA1Ny41NyI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiNmZmY7c3Ryb2tlOiMwMTliOGY7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPkxvY2F0aW9uIEljb248L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8xLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMSI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNMTkuMTksMUExOC4xOSwxOC4xOSwwLDAsMCwyLjk0LDI3LjM2aDBhMTkuNTEsMTkuNTEsMCwwLDAsMSwxLjc4TDE5LjE5LDU1LjU3LDM0LjM4LDI5LjIxQTE4LjE5LDE4LjE5LDAsMCwwLDE5LjE5LDFabTAsMjMuMjlhNS41Myw1LjUzLDAsMSwxLDUuNTMtNS41M0E1LjUzLDUuNTMsMCwwLDEsMTkuMTksMjQuMjlaIi8+PC9nPjwvZz48L3N2Zz4="
-          />
-        </figure>
+          <figure
+            className="euiImage canvasAsset__img"
+            style={
+              Object {
+                "backgroundImage": "url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzOC4zOSA1Ny41NyI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiNmZmY7c3Ryb2tlOiMwMTliOGY7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPkxvY2F0aW9uIEljb248L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8xLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMSI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNMTkuMTksMUExOC4xOSwxOC4xOSwwLDAsMCwyLjk0LDI3LjM2aDBhMTkuNTEsMTkuNTEsMCwwLDAsMSwxLjc4TDE5LjE5LDU1LjU3LDM0LjM4LDI5LjIxQTE4LjE5LDE4LjE5LDAsMCwwLDE5LjE5LDFabTAsMjMuMjlhNS41Myw1LjUzLDAsMSwxLDUuNTMtNS41M0E1LjUzLDUuNTMsMCwwLDEsMTkuMTksMjQuMjlaIi8+PC9nPjwvZz48L3N2Zz4=)",
+              }
+            }
+          >
+            <img
+              alt="Asset thumbnail"
+              className="euiImage__img"
+              src="data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCAzOC4zOSA1Ny41NyI+PGRlZnM+PHN0eWxlPi5jbHMtMXtmaWxsOiNmZmY7c3Ryb2tlOiMwMTliOGY7c3Ryb2tlLW1pdGVybGltaXQ6MTA7c3Ryb2tlLXdpZHRoOjJweDt9PC9zdHlsZT48L2RlZnM+PHRpdGxlPkxvY2F0aW9uIEljb248L3RpdGxlPjxnIGlkPSJMYXllcl8yIiBkYXRhLW5hbWU9IkxheWVyIDIiPjxnIGlkPSJMYXllcl8xLTIiIGRhdGEtbmFtZT0iTGF5ZXIgMSI+PHBhdGggY2xhc3M9ImNscy0xIiBkPSJNMTkuMTksMUExOC4xOSwxOC4xOSwwLDAsMCwyLjk0LDI3LjM2aDBhMTkuNTEsMTkuNTEsMCwwLDAsMSwxLjc4TDE5LjE5LDU1LjU3LDM0LjM4LDI5LjIxQTE4LjE5LDE4LjE5LDAsMCwwLDE5LjE5LDFabTAsMjMuMjlhNS41Myw1LjUzLDAsMSwxLDUuNTMtNS41M0E1LjUzLDUuNTMsMCwwLDEsMTkuMTksMjQuMjlaIi8+PC9nPjwvZz48L3N2Zz4="
+            />
+          </figure>
+        </button>
       </div>
       <div
         className="euiSpacer euiSpacer--s"
diff --git a/x-pack/plugins/canvas/public/components/element_card/__examples__/__snapshots__/element_card.examples.storyshot b/x-pack/plugins/canvas/public/components/element_card/__examples__/__snapshots__/element_card.examples.storyshot
index 8e38987a59a40d..e6533da1b59ec4 100644
--- a/x-pack/plugins/canvas/public/components/element_card/__examples__/__snapshots__/element_card.examples.storyshot
+++ b/x-pack/plugins/canvas/public/components/element_card/__examples__/__snapshots__/element_card.examples.storyshot
@@ -142,7 +142,7 @@ exports[`Storyshots components/ElementCard with tags 1`] = `
       className="euiCard__footer"
     >
       <span
-        className="euiBadge"
+        className="euiBadge euiBadge--iconLeft"
         style={
           Object {
             "backgroundColor": "#666666",
@@ -161,7 +161,7 @@ exports[`Storyshots components/ElementCard with tags 1`] = `
         </span>
       </span>
       <span
-        className="euiBadge"
+        className="euiBadge euiBadge--iconLeft"
         style={
           Object {
             "backgroundColor": "#666666",
@@ -180,7 +180,7 @@ exports[`Storyshots components/ElementCard with tags 1`] = `
         </span>
       </span>
       <span
-        className="euiBadge"
+        className="euiBadge euiBadge--iconLeft"
         style={
           Object {
             "backgroundColor": "#666666",
@@ -199,7 +199,7 @@ exports[`Storyshots components/ElementCard with tags 1`] = `
         </span>
       </span>
       <span
-        className="euiBadge"
+        className="euiBadge euiBadge--iconLeft"
         style={
           Object {
             "backgroundColor": "#666666",
@@ -218,7 +218,7 @@ exports[`Storyshots components/ElementCard with tags 1`] = `
         </span>
       </span>
       <span
-        className="euiBadge"
+        className="euiBadge euiBadge--iconLeft"
         style={
           Object {
             "backgroundColor": "#666666",
@@ -237,7 +237,7 @@ exports[`Storyshots components/ElementCard with tags 1`] = `
         </span>
       </span>
       <span
-        className="euiBadge"
+        className="euiBadge euiBadge--iconLeft"
         style={
           Object {
             "backgroundColor": "#666666",
diff --git a/x-pack/plugins/canvas/public/components/element_types/__examples__/__snapshots__/element_grid.examples.storyshot b/x-pack/plugins/canvas/public/components/element_types/__examples__/__snapshots__/element_grid.examples.storyshot
index cd66f28975445d..ecf2961601eb72 100644
--- a/x-pack/plugins/canvas/public/components/element_types/__examples__/__snapshots__/element_grid.examples.storyshot
+++ b/x-pack/plugins/canvas/public/components/element_types/__examples__/__snapshots__/element_grid.examples.storyshot
@@ -491,7 +491,7 @@ exports[`Storyshots components/ElementTypes/ElementGrid with tags filter 1`] = `
           className="euiCard__footer"
         >
           <span
-            className="euiBadge"
+            className="euiBadge euiBadge--iconLeft"
             style={
               Object {
                 "backgroundColor": "#666666",
@@ -565,7 +565,7 @@ exports[`Storyshots components/ElementTypes/ElementGrid with text filter 1`] = `
           className="euiCard__footer"
         >
           <span
-            className="euiBadge"
+            className="euiBadge euiBadge--iconLeft"
             style={
               Object {
                 "backgroundColor": "#666666",
@@ -639,7 +639,7 @@ exports[`Storyshots components/ElementTypes/ElementGrid without controls 1`] = `
           className="euiCard__footer"
         >
           <span
-            className="euiBadge"
+            className="euiBadge euiBadge--iconLeft"
             style={
               Object {
                 "backgroundColor": "#666666",
@@ -698,7 +698,7 @@ exports[`Storyshots components/ElementTypes/ElementGrid without controls 1`] = `
           className="euiCard__footer"
         >
           <span
-            className="euiBadge"
+            className="euiBadge euiBadge--iconLeft"
             style={
               Object {
                 "backgroundColor": "#666666",
@@ -757,7 +757,7 @@ exports[`Storyshots components/ElementTypes/ElementGrid without controls 1`] = `
           className="euiCard__footer"
         >
           <span
-            className="euiBadge"
+            className="euiBadge euiBadge--iconLeft"
             style={
               Object {
                 "backgroundColor": "#666666",
diff --git a/x-pack/plugins/canvas/public/components/font_picker/__snapshots__/font_picker.examples.storyshot b/x-pack/plugins/canvas/public/components/font_picker/__snapshots__/font_picker.examples.storyshot
index 7c433bdb983dc0..4acb2644f607a0 100644
--- a/x-pack/plugins/canvas/public/components/font_picker/__snapshots__/font_picker.examples.storyshot
+++ b/x-pack/plugins/canvas/public/components/font_picker/__snapshots__/font_picker.examples.storyshot
@@ -31,8 +31,8 @@ exports[`Storyshots components/FontPicker default 1`] = `
         <button
           aria-haspopup="true"
           aria-labelledby="undefined generated-id"
+          aria-selected={true}
           className="euiSuperSelectControl euiSuperSelectControl--compressed"
-          onChange={[Function]}
           onClick={[Function]}
           onKeyDown={[Function]}
           role="option"
@@ -105,8 +105,8 @@ exports[`Storyshots components/FontPicker with value 1`] = `
         <button
           aria-haspopup="true"
           aria-labelledby="undefined generated-id"
+          aria-selected={true}
           className="euiSuperSelectControl euiSuperSelectControl--compressed"
-          onChange={[Function]}
           onClick={[Function]}
           onKeyDown={[Function]}
           role="option"
diff --git a/x-pack/plugins/canvas/public/components/tag/__examples__/__snapshots__/tag.examples.storyshot b/x-pack/plugins/canvas/public/components/tag/__examples__/__snapshots__/tag.examples.storyshot
index 0d4fa0dcb50d12..b9939b63f5b835 100644
--- a/x-pack/plugins/canvas/public/components/tag/__examples__/__snapshots__/tag.examples.storyshot
+++ b/x-pack/plugins/canvas/public/components/tag/__examples__/__snapshots__/tag.examples.storyshot
@@ -2,7 +2,7 @@
 
 exports[`Storyshots components/Tag as badge 1`] = `
 <span
-  className="euiBadge"
+  className="euiBadge euiBadge--iconLeft"
   style={
     Object {
       "backgroundColor": "#666666",
@@ -24,7 +24,7 @@ exports[`Storyshots components/Tag as badge 1`] = `
 
 exports[`Storyshots components/Tag as badge with color 1`] = `
 <span
-  className="euiBadge"
+  className="euiBadge euiBadge--iconLeft"
   style={
     Object {
       "backgroundColor": "#327b53",
diff --git a/x-pack/plugins/canvas/public/components/tag_list/__examples__/__snapshots__/tag_list.examples.storyshot b/x-pack/plugins/canvas/public/components/tag_list/__examples__/__snapshots__/tag_list.examples.storyshot
index 36a31bb85510cc..9a14642dae7f32 100644
--- a/x-pack/plugins/canvas/public/components/tag_list/__examples__/__snapshots__/tag_list.examples.storyshot
+++ b/x-pack/plugins/canvas/public/components/tag_list/__examples__/__snapshots__/tag_list.examples.storyshot
@@ -5,7 +5,7 @@ exports[`Storyshots components/TagList empty list 1`] = `null`;
 exports[`Storyshots components/TagList with badge tags 1`] = `
 Array [
   <span
-    className="euiBadge"
+    className="euiBadge euiBadge--iconLeft"
     style={
       Object {
         "backgroundColor": "#cc3b54",
@@ -24,7 +24,7 @@ Array [
     </span>
   </span>,
   <span
-    className="euiBadge"
+    className="euiBadge euiBadge--iconLeft"
     style={
       Object {
         "backgroundColor": "#5bc149",
@@ -43,7 +43,7 @@ Array [
     </span>
   </span>,
   <span
-    className="euiBadge"
+    className="euiBadge euiBadge--iconLeft"
     style={
       Object {
         "backgroundColor": "#fbc545",
@@ -162,7 +162,7 @@ Array [
 exports[`Storyshots components/TagList with lots of tags 1`] = `
 Array [
   <span
-    className="euiBadge"
+    className="euiBadge euiBadge--iconLeft"
     style={
       Object {
         "backgroundColor": "#cc3b54",
@@ -181,7 +181,7 @@ Array [
     </span>
   </span>,
   <span
-    className="euiBadge"
+    className="euiBadge euiBadge--iconLeft"
     style={
       Object {
         "backgroundColor": "#5bc149",
@@ -200,7 +200,7 @@ Array [
     </span>
   </span>,
   <span
-    className="euiBadge"
+    className="euiBadge euiBadge--iconLeft"
     style={
       Object {
         "backgroundColor": "#fbc545",
@@ -219,7 +219,7 @@ Array [
     </span>
   </span>,
   <span
-    className="euiBadge"
+    className="euiBadge euiBadge--iconLeft"
     style={
       Object {
         "backgroundColor": "#9b3067",
@@ -238,7 +238,7 @@ Array [
     </span>
   </span>,
   <span
-    className="euiBadge"
+    className="euiBadge euiBadge--iconLeft"
     style={
       Object {
         "backgroundColor": "#1819bd",
@@ -257,7 +257,7 @@ Array [
     </span>
   </span>,
   <span
-    className="euiBadge"
+    className="euiBadge euiBadge--iconLeft"
     style={
       Object {
         "backgroundColor": "#d41e93",
@@ -276,7 +276,7 @@ Array [
     </span>
   </span>,
   <span
-    className="euiBadge"
+    className="euiBadge euiBadge--iconLeft"
     style={
       Object {
         "backgroundColor": "#3486d2",
@@ -295,7 +295,7 @@ Array [
     </span>
   </span>,
   <span
-    className="euiBadge"
+    className="euiBadge euiBadge--iconLeft"
     style={
       Object {
         "backgroundColor": "#b870d8",
@@ -314,7 +314,7 @@ Array [
     </span>
   </span>,
   <span
-    className="euiBadge"
+    className="euiBadge euiBadge--iconLeft"
     style={
       Object {
         "backgroundColor": "#f4a4a7",
@@ -333,7 +333,7 @@ Array [
     </span>
   </span>,
   <span
-    className="euiBadge"
+    className="euiBadge euiBadge--iconLeft"
     style={
       Object {
         "backgroundColor": "#072d6d",