diff --git a/includes/restapi.php b/includes/restapi.php
index 68207b2b..4c11cfce 100644
--- a/includes/restapi.php
+++ b/includes/restapi.php
@@ -56,7 +56,7 @@ function DisplayRestAPI()
     if ($serviceStatus == "up") {
         $docUrl = getDocUrl();
         $faicon = "<i class=\"text-gray-500 fas fa-external-link-alt ml-1\"></i>"; 
-        $docMsg = sprintf(_("RestAPI docs are accessible <a href=\"%s\" target=\"_blank\">here%s</a>"),$docUrl, $faicon);
+        $docMsg = sprintf(_("RestAPI docs are accessible <a href=\"%s\" target=\"_blank\">here %s</a>"),$docUrl, $faicon);
     }
 
     echo renderTemplate("restapi", compact(
diff --git a/templates/admin.php b/templates/admin.php
index 98cf4240..e8a34cd7 100755
--- a/templates/admin.php
+++ b/templates/admin.php
@@ -25,11 +25,9 @@
           <div class="row">
             <div class="mb-3 col-md-6">
               <div class="mb-2"><?php echo _("Old password"); ?></div>
-              <div class="input-group">
+              <div class="input-group has-validation">
                 <input type="password" class="form-control" name="oldpass" required />
-                <div class="input-group-append">
-                  <button class="btn btn-light js-toggle-password" type="button" data-bs-target="[name=oldpass]" data-toggle-with="fas fa-eye-slash"><i class="fas fa-eye mx-2"></i></button>
-                </div>
+                <div class="input-group-text js-toggle-password" data-bs-target="[name=oldpass]" data-toggle-with="fas fa-eye-slash"><i class="fas fa-eye mx-2"></i></div>
                 <div class="invalid-feedback">
                   <?php echo _("Please enter your old password."); ?>
                 </div>
@@ -39,11 +37,9 @@
           <div class="row">
             <div class="mb-3 col-md-6">
               <div class="mb-2"><?php echo _("New password"); ?></div>
-              <div class="input-group">
+              <div class="input-group has-validation">
                 <input type="password" class="form-control" name="newpass" required />
-                <div class="input-group-append">
-                  <button class="btn btn-light js-toggle-password" type="button" data-bs-target="[name=newpass]" data-toggle-with="fas fa-eye-slash"><i class="fas fa-eye mx-2"></i></button>
-                </div>
+                <div class="input-group-text js-toggle-password" data-bs-target="[name=newpass]" data-toggle-with="fas fa-eye-slash"><i class="fas fa-eye mx-2"></i></div>
                 <div class="invalid-feedback">
                   <?php echo _("Please enter a new password."); ?>
                 </div>
@@ -53,11 +49,9 @@
           <div class="row">
             <div class="mb-3 col-md-6">
               <div class="mb-2"><?php echo _("Repeat new password"); ?></div>
-              <div class="input-group">
+              <div class="input-group has-validation">
                 <input type="password" class="form-control" name="newpassagain" required />
-                <div class="input-group-append">
-                  <button class="btn btn-light js-toggle-password" type="button" data-bs-target="[name=newpassagain]" data-toggle-with="fas fa-eye-slash"><i class="fas fa-eye mx-2"></i></button>
-                </div>
+                <div class="input-group-text js-toggle-password" data-bs-target="[name=newpassagain]" data-toggle-with="fas fa-eye-slash"><i class="fas fa-eye mx-2"></i></div>
                 <div class="invalid-feedback">
                   <?php echo _("Please re-enter your new password."); ?>
                 </div>
diff --git a/templates/dhcp/advanced.php b/templates/dhcp/advanced.php
index a5c45696..28256114 100644
--- a/templates/dhcp/advanced.php
+++ b/templates/dhcp/advanced.php
@@ -20,8 +20,7 @@
         <?php foreach ($upstreamServers as $server): ?>
           <div class="mb-3 input-group input-group-sm js-dhcp-upstream-server">
             <input type="text" class="form-control" name="server[]" value="<?php echo $server ?>">
-            <div class="input-group-append">
-              <button class="btn btn-outline-secondary js-remove-dhcp-upstream-server" type="button"><i class="fas fa-minus"></i></button>
+            <div class="input-group-text js-remove-dhcp-upstream-server"><i class="fas fa-minus"></i></div>
             </div>
           </div>
         <?php endforeach ?>
@@ -31,9 +30,7 @@
         <label for="add-dhcp-upstream-server-field"><?php echo _("Add upstream DNS server") ?></label>
         <div class="input-group">
           <input type="text" class="form-control" id="add-dhcp-upstream-server-field" aria-describedby="new-dhcp-upstream-server" placeholder="<?php printf(_("e.g. %s"), "208.67.222.222") ?>">
-          <div class="input-group-append">
-            <button type="button" class="btn btn-outline-secondary js-add-dhcp-upstream-server"><i class="fas fa-plus"></i></button>
-          </div>
+          <div class="input-group-text js-add-dhcp-upstream-server"><i class="fas fa-plus"></i></div>
         </div>
         <p id="new-dhcp-upstream-server" class="form-text text-muted">
           <small>
@@ -52,9 +49,7 @@
     <template id="dhcp-upstream-server">
       <div class="mb-3 input-group input-group-sm js-dhcp-upstream-server">
         <input type="text" class="form-control" name="server[]" value="{{ server }}">
-        <div class="input-group-append">
-          <button class="btn btn-outline-secondary js-remove-dhcp-upstream-server" type="button"><i class="fas fa-minus"></i></button>
-        </div>
+        <div class="input-group-text js-remove-dhcp-upstream-server"><i class="fas fa-minus"></i></div>
       </div>
     </template>
   </div><!-- /.row -->
diff --git a/templates/restapi/general.php b/templates/restapi/general.php
index 2687be45..6bfb01f7 100644
--- a/templates/restapi/general.php
+++ b/templates/restapi/general.php
@@ -10,11 +10,9 @@
       <div class="row mt-3">
         <div class="mb-3 col-md-6" required>
           <label for="txtapikey"><?php echo _("API Key"); ?></label>
-          <div class="input-group">
+          <div class="input-group has-validation">
               <input type="text" class="form-control" id="txtapikey" name="txtapikey" value="<?php echo htmlspecialchars($apiKey, ENT_QUOTES); ?>" required />
-              <div class="input-group-append">
-                <button class="btn btn-outline-secondary" type="button" id="gen_apikey"><i class="fas fa-magic"></i></button>
-              </div>
+              <div class="input-group-text" id="gen_apikey"><i class="fa-solid fa-wand-magic-sparkles"></i></div>
               <div class="invalid-feedback">
                 <?php echo _("Please provide a valid API key."); ?>
               </div>