diff --git a/src/bootstrap/__tests__/__snapshots__/RadioSet.test.js.snap b/src/bootstrap/__tests__/__snapshots__/RadioSet.test.js.snap
index 7539dd2..9a57656 100644
--- a/src/bootstrap/__tests__/__snapshots__/RadioSet.test.js.snap
+++ b/src/bootstrap/__tests__/__snapshots__/RadioSet.test.js.snap
@@ -11,7 +11,7 @@ exports[`<RadioSet/> Render radio set 1`] = `
     Radios set label
   </label>
   <div
-    class="custom-control custom-radio custom-control-inline"
+    class="custom-control custom-radio"
   >
     <input
       checked=""
@@ -29,7 +29,7 @@ exports[`<RadioSet/> Render radio set 1`] = `
     </label>
   </div>
   <div
-    class="custom-control custom-radio custom-control-inline"
+    class="custom-control custom-radio"
   >
     <input
       class="custom-control-input"
@@ -46,7 +46,7 @@ exports[`<RadioSet/> Render radio set 1`] = `
     </label>
   </div>
   <div
-    class="custom-control custom-radio custom-control-inline"
+    class="custom-control custom-radio"
   >
     <input
       class="custom-control-input"
diff --git a/src/bootstrap/__tests__/__snapshots__/Switch.test.js.snap b/src/bootstrap/__tests__/__snapshots__/Switch.test.js.snap
index cc5f8c9..e0c171f 100644
--- a/src/bootstrap/__tests__/__snapshots__/Switch.test.js.snap
+++ b/src/bootstrap/__tests__/__snapshots__/Switch.test.js.snap
@@ -2,7 +2,7 @@
 
 exports[`<Switch/> Render switch 1`] = `
 <div
-  class="form-group"
+  class="form-group switch"
 >
   <div
     class="custom-control custom-switch"
@@ -30,7 +30,7 @@ exports[`<Switch/> Render switch 1`] = `
 
 exports[`<Switch/> Render uncheked switch 1`] = `
 <div
-  class="form-group"
+  class="form-group switch"
 >
   <div
     class="custom-control custom-switch"
diff --git a/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap b/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap
index f206bb6..60cac96 100644
--- a/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap
+++ b/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap
@@ -255,7 +255,7 @@ exports[`<WiFiSettings/> Snapshot both modules disabled. 1`] = `
   >
     <form>
       <div
-        class="form-group"
+        class="form-group switch"
       >
         <div
           class="custom-control custom-switch custom-control-inline switch-heading"
@@ -277,7 +277,7 @@ exports[`<WiFiSettings/> Snapshot both modules disabled. 1`] = `
       </div>
       <hr />
       <div
-        class="form-group"
+        class="form-group switch"
       >
         <div
           class="custom-control custom-switch custom-control-inline switch-heading"
@@ -423,7 +423,7 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
 +       </div>
         <hr />
         <div
-          class=\\"form-group\\"
+          class=\\"form-group switch\\"
         >
           <div
 @@ -501,10 +580,11 @@
@@ -560,7 +560,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +           GHz
 +         </label>
 +         <div
-+           class=\\"custom-control custom-radio custom-control-inline\\"
++           class=\\"custom-control custom-radio\\"
 +         >
 +           <input
 +             class=\\"custom-control-input\\"
@@ -577,7 +577,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +           </label>
 +         </div>
 +         <div
-+           class=\\"custom-control custom-radio custom-control-inline\\"
++           class=\\"custom-control custom-radio\\"
 +         >
 +           <input
 +             checked=\\"\\"
@@ -876,7 +876,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +         </select>
 +       </div>
 +       <div
-+         class=\\"form-group\\"
++         class=\\"form-group switch\\"
 +       >
 +         <div
 +           class=\\"custom-control custom-switch\\"
@@ -905,7 +905,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +       </div>
         <hr />
         <div
-          class=\\"form-group\\"
+          class=\\"form-group switch\\"
         >
           <div"
 `;