diff --git a/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap b/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap
index c62e511..f206bb6 100644
--- a/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap
+++ b/src/common/WiFiSettings/__tests__/__snapshots__/WiFiSettings.test.js.snap
@@ -5,7 +5,7 @@ exports[`<WiFiSettings/> Snapshot 2.4 GHz 1`] = `
 - First value
 + Second value
 
-@@ -246,207 +246,95 @@
+@@ -245,207 +245,95 @@
               value=\\"0\\"
             >
               auto
@@ -254,14 +254,11 @@ exports[`<WiFiSettings/> Snapshot both modules disabled. 1`] = `
     class="card p-4 col-sm-12 col-lg-12 p-0 mb-3"
   >
     <form>
-      <h2>
-        Wi-Fi 1
-      </h2>
       <div
         class="form-group"
       >
         <div
-          class="custom-control custom-checkbox "
+          class="custom-control custom-switch custom-control-inline switch-heading"
         >
           <input
             class="custom-control-input"
@@ -272,18 +269,18 @@ exports[`<WiFiSettings/> Snapshot both modules disabled. 1`] = `
             class="custom-control-label"
             for="1"
           >
-            Enable
+            <h2>
+              Wi-Fi 1
+            </h2>
           </label>
         </div>
       </div>
-      <h2>
-        Wi-Fi 2
-      </h2>
+      <hr />
       <div
         class="form-group"
       >
         <div
-          class="custom-control custom-checkbox "
+          class="custom-control custom-switch custom-control-inline switch-heading"
         >
           <input
             class="custom-control-input"
@@ -294,7 +291,9 @@ exports[`<WiFiSettings/> Snapshot both modules disabled. 1`] = `
             class="custom-control-label"
             for="2"
           >
-            Enable
+            <h2>
+              Wi-Fi 2
+            </h2>
           </label>
         </div>
       </div>
@@ -305,7 +304,7 @@ exports[`<WiFiSettings/> Snapshot both modules disabled. 1`] = `
           class="btn btn-primary  col-sm-12 col-md-3 col-lg-2"
           type="submit"
         >
-            Save
+          Save
         </button>
       </div>
     </form>
@@ -326,7 +325,7 @@ current Wi-Fi configuration and restore the default values.
       class="btn btn-warning col-sm-12 col-md-3 col-lg-2"
       type="button"
     >
-        Reset Wi-Fi Settings
+      Reset Wi-Fi Settings
     </button>
   </div>
 </DocumentFragment>
@@ -337,10 +336,10 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
 - First value
 + Second value
 
-@@ -475,10 +475,89 @@
+@@ -474,10 +474,89 @@
+          Parameters of the guest network can be set in the Guest network tab.
           
-              </small>
-            </label>
+            </small>
           </div>
         </div>
 +       <div
@@ -422,12 +421,12 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
 +     
 +         </small>
 +       </div>
-        <h2>
-          Wi-Fi 2
-        </h2>
+        <hr />
         <div
           class=\\"form-group\\"
-@@ -502,10 +581,11 @@
+        >
+          <div
+@@ -501,10 +580,11 @@
         <div
           class=\\"text-right\\"
         >
@@ -436,7 +435,7 @@ exports[`<WiFiSettings/> Snapshot guest network. 1`] = `
 +           disabled=\\"\\"
             type=\\"submit\\"
           >
-              Save
+            Save
           </button>
         </div>"
 `;
@@ -446,9 +445,9 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 - First value
 + Second value
 
-@@ -23,10 +23,462 @@
-            >
-              Enable
+@@ -22,10 +22,462 @@
+                Wi-Fi 1
+              </h2>
             </label>
           </div>
         </div>
@@ -880,7 +879,7 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +         class=\\"form-group\\"
 +       >
 +         <div
-+           class=\\"custom-control custom-checkbox \\"
++           class=\\"custom-control custom-switch\\"
 +         >
 +           <input
 +             class=\\"custom-control-input\\"
@@ -891,22 +890,22 @@ exports[`<WiFiSettings/> Snapshot one module enabled. 1`] = `
 +             class=\\"custom-control-label\\"
 +             for=\\"10\\"
 +           >
-+             Enable Guest Wifi
-+             <small
-+               class=\\"form-text text-muted\\"
-+             >
-+               
++             Enable Guest Wi-Fi
++           </label>
++           <small
++             class=\\"form-text text-muted mt-0 mb-3\\"
++           >
++             
 +         Enables Wi-Fi for guests, which is separated from LAN network. Devices connected to this network are allowed to
 +         access the internet, but aren't allowed to access other devices and the configuration interface of the router.
 +         Parameters of the guest network can be set in the Guest network tab.
 +         
-+             </small>
-+           </label>
++           </small>
 +         </div>
 +       </div>
-        <h2>
-          Wi-Fi 2
-        </h2>
+        <hr />
         <div
-          class=\\"form-group\\""
+          class=\\"form-group\\"
+        >
+          <div"
 `;