diff --git a/resources/lang/en-US/admin/users/general.php b/resources/lang/en-US/admin/users/general.php
index fa0f478d4b..684f36f6c8 100644
--- a/resources/lang/en-US/admin/users/general.php
+++ b/resources/lang/en-US/admin/users/general.php
@@ -53,4 +53,5 @@ return [
     'all_assigned_list_generation' => 'Generated on:',
     'email_user_creds_on_create' => 'Email this user their credentials?',
     'department_manager' => 'Department Manager',
+    'generate_password' => 'Generate random password',
 ];
diff --git a/resources/views/modals/user.blade.php b/resources/views/modals/user.blade.php
index e9b83fc5ae..6b74223759 100644
--- a/resources/views/modals/user.blade.php
+++ b/resources/views/modals/user.blade.php
@@ -59,9 +59,14 @@
                             <div class="col-md-3 col-xs-12">
                                 <label class="control-label" for="modal-password">{{ trans('admin/users/table.password') }}:</label>
                             </div>
-                            <div class="col-md-8 col-xs-12 " style="margin-bottom:5px;">
+                            <div class="col-md-7 col-xs-12">
                                 <input type='password' name="password" id='modal-password' class="form-control" required>
-                                <a href="#" class="left" id="modal-genPassword">Generate</a>
+                                <div id="modal-generated-password"></div>
+                            </div>
+                            <div class="col-md-1">
+                                <a href="#" class="btn btn-default btn-sm" id="modal-genPassword" data-tooltip="true" title="{{ trans('admin/users/general.generate_password') }}">
+                                    <i class="fa-solid fa-wand-magic-sparkles"></i>
+                                </a>
                                 <div id="modal-generated-password"></div>
                             </div>
                         </div>
@@ -72,9 +77,8 @@
                             <div class="col-md-3 col-xs-12 ">
                                 <label class="control-label" for="modal-password_confirmation">{{ trans('admin/users/table.password_confirm') }}:</label>
                             </div>
-                            <div class="col-md-8 col-xs-12">
+                            <div class="col-md-7 col-xs-12">
                                 <input class="form-control" type='password' name="password_confirmation" id='modal-password_confirmation' required>
-
                             </div>
                          </div>
                     </div>
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 47e143c1ac..4dcc3afb7a 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -145,10 +145,12 @@
 
                   </div>
 
-                  <div class="col-md-2">
+                  <div class="col-md-1 pull-left">
 
                     @if (Gate::allows('editableOnDemo') && (Gate::allows('canEditAuthFields', $user)) && ($user->ldap_import!='1'))
-                      <a href="#" class="left" id="genPassword">{{ trans('general.generate') }}</a>
+                      <a href="#" class="text-left btn btn-default btn-sm" id="genPassword" data-tooltip="true" title="{{ trans('admin/users/general.generate_password') }}">
+                          <i class="fa-solid fa-wand-magic-sparkles"></i>
+                      </a>
                     @endif
                   </div>
                 </div>