diff --git a/core/scripts/webpanel/templates/users.html b/core/scripts/webpanel/templates/users.html
index 18c072f..099f8c5 100644
--- a/core/scripts/webpanel/templates/users.html
+++ b/core/scripts/webpanel/templates/users.html
@@ -379,24 +379,46 @@
                         <form id="addUserForm" class="mt-3">
                             <div class="form-group">
                                 <label for="addUsername">Username</label>
-                                <input type="text" class="form-control" id="addUsername" name="username" required>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fas fa-user"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" id="addUsername" name="username" required>
+                                </div>
                                 <small class="form-text text-danger" id="addUsernameError"></small>
                             </div>
                             <div class="form-group">
                                 <label for="addTrafficLimit">Traffic Limit (GB)</label>
-                                <input type="number" class="form-control" id="addTrafficLimit" name="traffic_limit" required>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fas fa-database"></i></span>
+                                    </div>
+                                    <input type="number" class="form-control" id="addTrafficLimit" name="traffic_limit" required>
+                                </div>
                             </div>
                             <div class="form-group">
                                 <label for="addExpirationDays">Expiration Days</label>
-                                <input type="number" class="form-control" id="addExpirationDays" name="expiration_days" required>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fas fa-calendar-alt"></i></span>
+                                    </div>
+                                    <input type="number" class="form-control" id="addExpirationDays" name="expiration_days" required>
+                                </div>
                             </div>
                             <div class="form-group">
                                 <label for="addNote">Note (Optional)</label>
-                                <input type="text" class="form-control" id="addNote" name="note">
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fas fa-sticky-note"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" id="addNote" name="note">
+                                </div>
                             </div>
                             <div class="form-check mb-3 requires-iplimit-service" style="display: none;">
                                 <input type="checkbox" class="form-check-input" id="addUnlimited" name="unlimited">
-                                <label class="form-check-label" for="addUnlimited">Unlimited IP</label>
+                                <label class="form-check-label" for="addUnlimited">
+                                    <i class="fas fa-shield-alt text-primary mr-2"></i>Unlimited IP
+                                </label>
                             </div>
                             <button type="submit" class="btn btn-primary" id="addSubmitButton">Add User</button>
                         </form>
@@ -405,32 +427,59 @@
                         <form id="addBulkUsersForm" class="mt-3">
                             <div class="form-group">
                                 <label for="addBulkPrefix">Username Prefix</label>
-                                <input type="text" class="form-control" id="addBulkPrefix" name="prefix" required>
+                                <div class="input-group">
+                                    <div class="input-group-prepend">
+                                        <span class="input-group-text"><i class="fas fa-users"></i></span>
+                                    </div>
+                                    <input type="text" class="form-control" id="addBulkPrefix" name="prefix" required>
+                                </div>
                                 <small class="form-text text-danger" id="addBulkPrefixError"></small>
                             </div>
                              <div class="form-row">
                                 <div class="form-group col-md-6">
                                     <label for="addBulkCount">Number of Users</label>
-                                    <input type="number" class="form-control" id="addBulkCount" name="count" value="10" required>
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text"><i class="fas fa-hashtag"></i></span>
+                                        </div>
+                                        <input type="number" class="form-control" id="addBulkCount" name="count" value="10" required>
+                                    </div>
                                 </div>
                                 <div class="form-group col-md-6">
                                     <label for="addBulkStartNumber">Start Number</label>
-                                    <input type="number" class="form-control" id="addBulkStartNumber" name="start_number" value="1" required>
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text"><i class="fas fa-play-circle"></i></span>
+                                        </div>
+                                        <input type="number" class="form-control" id="addBulkStartNumber" name="start_number" value="1" required>
+                                    </div>
                                 </div>
                             </div>
                             <div class="form-row">
                                 <div class="form-group col-md-6">
                                     <label for="addBulkTrafficLimit">Traffic Limit (GB)</label>
-                                    <input type="number" class="form-control" id="addBulkTrafficLimit" name="traffic_gb" required>
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text"><i class="fas fa-database"></i></span>
+                                        </div>
+                                        <input type="number" class="form-control" id="addBulkTrafficLimit" name="traffic_gb" required>
+                                    </div>
                                 </div>
                                 <div class="form-group col-md-6">
                                     <label for="addBulkExpirationDays">Expiration Days</label>
-                                    <input type="number" class="form-control" id="addBulkExpirationDays" name="expiration_days" required>
+                                    <div class="input-group">
+                                        <div class="input-group-prepend">
+                                            <span class="input-group-text"><i class="fas fa-calendar-alt"></i></span>
+                                        </div>
+                                        <input type="number" class="form-control" id="addBulkExpirationDays" name="expiration_days" required>
+                                    </div>
                                 </div>
                             </div>
                             <div class="form-check mb-3 requires-iplimit-service" style="display: none;">
                                 <input type="checkbox" class="form-check-input" id="addBulkUnlimited" name="unlimited">
-                                <label class="form-check-label" for="addBulkUnlimited">Unlimited IP</label>
+                                <label class="form-check-label" for="addBulkUnlimited">
+                                    <i class="fas fa-shield-alt text-primary mr-2"></i>Unlimited IP
+                                </label>
                             </div>
                             <button type="submit" class="btn btn-primary" id="addBulkSubmitButton">Add Bulk Users</button>
                         </form>
@@ -482,7 +531,12 @@
                     </div>
                     <div class="form-group">
                         <label for="editNote">Note</label>
-                        <textarea class="form-control" id="editNote" name="note" rows="3"></textarea>
+                         <div class="input-group">
+                            <div class="input-group-prepend">
+                                <span class="input-group-text"><i class="fas fa-sticky-note"></i></span>
+                            </div>
+                            <textarea class="form-control" id="editNote" name="note" rows="3"></textarea>
+                        </div>
                     </div>
                     <div class="form-check">
                         <input type="checkbox" class="form-check-input" id="editBlocked" name="blocked">