diff --git a/public/components/SwitchableEditor/__snapshots__/SwitchableEditor.test.tsx.snap b/public/components/SwitchableEditor/__snapshots__/SwitchableEditor.test.tsx.snap
index 5223fa162..903629b2d 100644
--- a/public/components/SwitchableEditor/__snapshots__/SwitchableEditor.test.tsx.snap
+++ b/public/components/SwitchableEditor/__snapshots__/SwitchableEditor.test.tsx.snap
@@ -7,7 +7,7 @@ HTMLCollection [
       class="euiSpacer euiSpacer--l"
     />
     <div
-      class="euiSwitch"
+      class="euiSwitch euiSwitch--primary"
     >
       <button
         aria-checked="false"
@@ -169,7 +169,7 @@ HTMLCollection [
       class="euiSpacer euiSpacer--l"
     />
     <div
-      class="euiSwitch"
+      class="euiSwitch euiSwitch--primary"
     >
       <button
         aria-checked="true"
diff --git a/public/pages/CreateComposableTemplate/containers/CreateComposableTemplate/__snapshots__/CreateComposableTemplate.test.tsx.snap b/public/pages/CreateComposableTemplate/containers/CreateComposableTemplate/__snapshots__/CreateComposableTemplate.test.tsx.snap
index a913e72cb..f4f5a407d 100644
--- a/public/pages/CreateComposableTemplate/containers/CreateComposableTemplate/__snapshots__/CreateComposableTemplate.test.tsx.snap
+++ b/public/pages/CreateComposableTemplate/containers/CreateComposableTemplate/__snapshots__/CreateComposableTemplate.test.tsx.snap
@@ -216,7 +216,7 @@ exports[`<CreateComposableTemplate /> spec it goes to templates page when click
                 >
                   <div>
                     <div
-                      class="euiSwitch"
+                      class="euiSwitch euiSwitch--primary"
                     >
                       <button
                         aria-checked="false"
@@ -299,7 +299,7 @@ exports[`<CreateComposableTemplate /> spec it goes to templates page when click
                 >
                   <div>
                     <div
-                      class="euiSwitch"
+                      class="euiSwitch euiSwitch--primary"
                     >
                       <button
                         aria-checked="false"
@@ -407,7 +407,7 @@ exports[`<CreateComposableTemplate /> spec it goes to templates page when click
               >
                 <div>
                   <div
-                    class="euiSwitch"
+                    class="euiSwitch euiSwitch--primary"
                   >
                     <button
                       aria-checked="false"
diff --git a/public/pages/CreateComposableTemplate/containers/TemplateDetail/__snapshots__/TemplateDetail.test.tsx.snap b/public/pages/CreateComposableTemplate/containers/TemplateDetail/__snapshots__/TemplateDetail.test.tsx.snap
index 8c6152fab..41e01cd49 100644
--- a/public/pages/CreateComposableTemplate/containers/TemplateDetail/__snapshots__/TemplateDetail.test.tsx.snap
+++ b/public/pages/CreateComposableTemplate/containers/TemplateDetail/__snapshots__/TemplateDetail.test.tsx.snap
@@ -251,7 +251,7 @@ exports[`<TemplateDetail /> spec render component 1`] = `
               >
                 <div>
                   <div
-                    class="euiSwitch"
+                    class="euiSwitch euiSwitch--primary"
                   >
                     <button
                       aria-checked="false"
@@ -334,7 +334,7 @@ exports[`<TemplateDetail /> spec render component 1`] = `
               >
                 <div>
                   <div
-                    class="euiSwitch"
+                    class="euiSwitch euiSwitch--primary"
                   >
                     <button
                       aria-checked="false"
@@ -442,7 +442,7 @@ exports[`<TemplateDetail /> spec render component 1`] = `
             >
               <div>
                 <div
-                  class="euiSwitch"
+                  class="euiSwitch euiSwitch--primary"
                 >
                   <button
                     aria-checked="false"
diff --git a/public/pages/Indices/components/IndexControls/__snapshots__/IndexControls.test.tsx.snap b/public/pages/Indices/components/IndexControls/__snapshots__/IndexControls.test.tsx.snap
index ce73f24cf..4a09d54d6 100644
--- a/public/pages/Indices/components/IndexControls/__snapshots__/IndexControls.test.tsx.snap
+++ b/public/pages/Indices/components/IndexControls/__snapshots__/IndexControls.test.tsx.snap
@@ -94,7 +94,7 @@ exports[`<IndexControls /> spec renders data streams selection field 1`] = `
     class="euiFlexItem euiFlexItem--flexGrowZero"
   >
     <div
-      class="euiSwitch"
+      class="euiSwitch euiSwitch--primary"
     >
       <button
         aria-checked="true"
@@ -186,7 +186,7 @@ exports[`<IndexControls /> spec renders the component 1`] = `
     class="euiFlexItem euiFlexItem--flexGrowZero"
   >
     <div
-      class="euiSwitch"
+      class="euiSwitch euiSwitch--primary"
     >
       <button
         aria-checked="false"
diff --git a/public/pages/Indices/containers/Indices/__snapshots__/Indices.test.tsx.snap b/public/pages/Indices/containers/Indices/__snapshots__/Indices.test.tsx.snap
index 191b4b655..dfeaa8ada 100644
--- a/public/pages/Indices/containers/Indices/__snapshots__/Indices.test.tsx.snap
+++ b/public/pages/Indices/containers/Indices/__snapshots__/Indices.test.tsx.snap
@@ -158,7 +158,7 @@ exports[`<Indices /> spec renders the component 1`] = `
         class="euiFlexItem euiFlexItem--flexGrowZero"
       >
         <div
-          class="euiSwitch"
+          class="euiSwitch euiSwitch--primary"
         >
           <button
             aria-checked="false"
diff --git a/public/pages/ManagedIndices/components/ManagedIndexControls/__snapshots__/ManagedIndexControls.test.tsx.snap b/public/pages/ManagedIndices/components/ManagedIndexControls/__snapshots__/ManagedIndexControls.test.tsx.snap
index e9bc7193b..96fc4f29c 100644
--- a/public/pages/ManagedIndices/components/ManagedIndexControls/__snapshots__/ManagedIndexControls.test.tsx.snap
+++ b/public/pages/ManagedIndices/components/ManagedIndexControls/__snapshots__/ManagedIndexControls.test.tsx.snap
@@ -83,7 +83,7 @@ exports[`<ManagedIndexControls /> spec renders data streams selection field 1`]
     class="euiFlexItem euiFlexItem--flexGrowZero"
   >
     <div
-      class="euiSwitch"
+      class="euiSwitch euiSwitch--primary"
     >
       <button
         aria-checked="true"
@@ -175,7 +175,7 @@ exports[`<ManagedIndexControls /> spec renders the component 1`] = `
     class="euiFlexItem euiFlexItem--flexGrowZero"
   >
     <div
-      class="euiSwitch"
+      class="euiSwitch euiSwitch--primary"
     >
       <button
         aria-checked="false"
diff --git a/public/pages/ManagedIndices/containers/ManagedIndices/__snapshots__/ManagedIndices.test.tsx.snap b/public/pages/ManagedIndices/containers/ManagedIndices/__snapshots__/ManagedIndices.test.tsx.snap
index d18bc6adb..bd13c9e87 100644
--- a/public/pages/ManagedIndices/containers/ManagedIndices/__snapshots__/ManagedIndices.test.tsx.snap
+++ b/public/pages/ManagedIndices/containers/ManagedIndices/__snapshots__/ManagedIndices.test.tsx.snap
@@ -204,7 +204,7 @@ exports[`<ManagedIndices /> spec renders the component 1`] = `
           class="euiFlexItem euiFlexItem--flexGrowZero"
         >
           <div
-            class="euiSwitch"
+            class="euiSwitch euiSwitch--primary"
           >
             <button
               aria-checked="false"
diff --git a/public/pages/Templates/containers/AssociatedComponentsModal/__snapshots__/AssociatedComponentsModal.test.tsx.snap b/public/pages/Templates/containers/AssociatedComponentsModal/__snapshots__/AssociatedComponentsModal.test.tsx.snap
index c5401295c..2c7cfd9ab 100644
--- a/public/pages/Templates/containers/AssociatedComponentsModal/__snapshots__/AssociatedComponentsModal.test.tsx.snap
+++ b/public/pages/Templates/containers/AssociatedComponentsModal/__snapshots__/AssociatedComponentsModal.test.tsx.snap
@@ -82,9 +82,7 @@ HTMLCollection [
                   >
                     <caption
                       class="euiScreenReaderOnly euiTableCaption"
-                    >
-                      This table contains 1 rows out of 1 rows; Page 1 of 1.
-                    </caption>
+                    />
                     <thead>
                       <tr>
                         <th
diff --git a/public/pages/VisualCreatePolicy/components/UIActions/AliasUIAction/__snapshots__/AliasUIAction.test.tsx.snap b/public/pages/VisualCreatePolicy/components/UIActions/AliasUIAction/__snapshots__/AliasUIAction.test.tsx.snap
index 64846aae6..ee5d567d9 100644
--- a/public/pages/VisualCreatePolicy/components/UIActions/AliasUIAction/__snapshots__/AliasUIAction.test.tsx.snap
+++ b/public/pages/VisualCreatePolicy/components/UIActions/AliasUIAction/__snapshots__/AliasUIAction.test.tsx.snap
@@ -3,7 +3,7 @@
 exports[`AliasUIAction component renders with blank action 1`] = `
 <div>
   <div
-    class="euiSwitch"
+    class="euiSwitch euiSwitch--primary"
   >
     <button
       aria-checked="true"
@@ -115,7 +115,7 @@ exports[`AliasUIAction component renders with blank action 1`] = `
     class="euiSpacer euiSpacer--l"
   />
   <div
-    class="euiSwitch"
+    class="euiSwitch euiSwitch--primary"
   >
     <button
       aria-checked="true"
@@ -229,7 +229,7 @@ exports[`AliasUIAction component renders with blank action 1`] = `
 exports[`AliasUIAction component renders with pre-defined actions 1`] = `
 <div>
   <div
-    class="euiSwitch"
+    class="euiSwitch euiSwitch--primary"
   >
     <button
       aria-checked="true"
@@ -458,7 +458,7 @@ exports[`AliasUIAction component renders with pre-defined actions 1`] = `
     class="euiSpacer euiSpacer--l"
   />
   <div
-    class="euiSwitch"
+    class="euiSwitch euiSwitch--primary"
   >
     <button
       aria-checked="true"