diff --git a/www/pages/setup.html b/www/pages/setup.html
index 8e3137e..423ffe5 100644
--- a/www/pages/setup.html
+++ b/www/pages/setup.html
@@ -16,15 +16,21 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
                     </div>
                     <form id="settings_form">
                         <div class="input-group">
-                            <span class="input-group-addon"><i class="fas fa-server"></i></span>
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fas fa-server"></i></span>
+                            </div>
                             <input type="text" class="form-control" id="url" placeholder="AccountHub API URL" required />
                         </div>
                         <div class="input-group">
-                            <span class="input-group-addon"><i class="fas fa-key"></i></span>
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fas fa-key"></i></span>
+                            </div>
                             <input type="text" class="form-control" id="key" placeholder="API Key" required />
                         </div>
                         <div class="input-group">
-                            <span class="input-group-addon"><i class="fas fa-users"></i></span>
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fas fa-users"></i></span>
+                            </div>
                             <select class="form-control" id="group">
                                 <option value="">Select a Quick Access Group</option>
                             </select>
@@ -36,14 +42,14 @@ file, You can obtain one at http://mozilla.org/MPL/2.0/.
                         </div>
                         <br />
                         <div class="form-check">
+                            <input class="form-check-input" value="1" type="checkbox" id="kioskmode">
                             <label class="form-check-label">
-                                <input class="form-check-input" value="1" type="checkbox" id="kioskmode">
                                 Kiosk mode (run in fullscreen)
                             </label>
                         </div>
                         <div class="form-check">
+                            <input class="form-check-input" value="1" type="checkbox" id="largebtns">
                             <label class="form-check-label">
-                                <input class="form-check-input" value="1" type="checkbox" id="largebtns">
                                 Use larger buttons if available
                             </label>
                         </div>