diff --git a/resources/views/account/profile.blade.php b/resources/views/account/profile.blade.php
index 20ed9e1d79a2..fb4118e3e795 100755
--- a/resources/views/account/profile.blade.php
+++ b/resources/views/account/profile.blade.php
@@ -18,9 +18,9 @@
       <div class="box-body">
 
           <fieldset name="display-preferences">
-              <x-form-legend>
+              <x-form.legend>
                   {{ trans('admin/settings/general.legends.display') }}
-              </x-form-legend>
+              </x-form.legend>
 
               <!-- Language -->
               <div class="form-group {{ $errors->has('locale') ? 'has-error' : '' }}">
@@ -110,9 +110,9 @@
           @can('self.profile')
 
           <fieldset name="user-preferences">
-              <x-form-legend>
+              <x-form.legend>
                   {{ trans('admin/settings/general.legends.your_details') }}
-              </x-form-legend>
+              </x-form.legend>
                 <!-- First Name -->
                     <div class="form-group {{ $errors->has('first_name') ? ' has-error' : '' }}">
                       <label for="first_name" class="col-md-3 control-label">{{ trans('general.first_name') }}
diff --git a/resources/views/blade/form-label.blade.php b/resources/views/blade/form/label.blade.php
similarity index 100%
rename from resources/views/blade/form-label.blade.php
rename to resources/views/blade/form/label.blade.php
diff --git a/resources/views/blade/form-legend-help.blade.php b/resources/views/blade/form/legend-help.blade.php
similarity index 100%
rename from resources/views/blade/form-legend-help.blade.php
rename to resources/views/blade/form/legend-help.blade.php
diff --git a/resources/views/blade/form-legend.blade.php b/resources/views/blade/form/legend.blade.php
similarity index 76%
rename from resources/views/blade/form-legend.blade.php
rename to resources/views/blade/form/legend.blade.php
index 3350c19df019..b935c83e8336 100644
--- a/resources/views/blade/form-legend.blade.php
+++ b/resources/views/blade/form/legend.blade.php
@@ -9,8 +9,8 @@
     </h4>
 
     @if ($help_text)
-        <x-form-legend-help :icon="$icon">
+        <x-form.legend-help :icon="$icon">
             {!!  $help_text !!}
-        </x-form-legend-help>
+        </x-form.legend-help>
     @endif
 </legend>
\ No newline at end of file
diff --git a/resources/views/blade/form-row.blade.php b/resources/views/blade/form/row.blade.php
similarity index 92%
rename from resources/views/blade/form-row.blade.php
rename to resources/views/blade/form/row.blade.php
index f30bfded239b..10c240f9248e 100644
--- a/resources/views/blade/form-row.blade.php
+++ b/resources/views/blade/form/row.blade.php
@@ -18,7 +18,7 @@
 
     <!-- form label -->
     @if (isset($label))
-        <x-form-label  :for="$name" class="{{ $label_class ?? 'col-md-3' }}">{{ $label }}</x-form-label>
+        <x-form.label  :for="$name" class="{{ $label_class ?? 'col-md-3' }}">{{ $label }}</x-form.label>
     @endif
 
 
@@ -46,9 +46,9 @@
     @if ($info_tooltip_text)
         <!-- Info Tooltip -->
         <div class="col-md-1 text-left" style="padding-left:0; margin-top: 5px;">
-            <x-form-tooltip>
+            <x-form.tooltip>
                 {{ $info_tooltip_text }}
-            </x-form-tooltip>
+            </x-form.tooltip>
         </div>
     @endif
 
diff --git a/resources/views/blade/form-tooltip.blade.php b/resources/views/blade/form/tooltip.blade.php
similarity index 100%
rename from resources/views/blade/form-tooltip.blade.php
rename to resources/views/blade/form/tooltip.blade.php
diff --git a/resources/views/categories/edit.blade.php b/resources/views/categories/edit.blade.php
index 598796227d15..bbbb10333696 100755
--- a/resources/views/categories/edit.blade.php
+++ b/resources/views/categories/edit.blade.php
@@ -10,7 +10,7 @@
 @section('inputFields')
 
     <!-- Name -->
-    <x-form-row
+    <x-form.row
             :label="trans('general.name')"
             :$item
             name="name"
@@ -85,9 +85,9 @@
 @endif
 
     <fieldset name="color-preferences">
-        <x-form-legend help_text="{{ trans('general.tag_color_help') }}">
+        <x-form.legend help_text="{{ trans('general.tag_color_help') }}">
             {{ trans('general.tag_color') }}
-        </x-form-legend>
+        </x-form.legend>
         <!--  color -->
         <div class="form-group {{ $errors->has('tag_color') ? 'error' : '' }}">
             <label for="tag_color" class="col-md-3 control-label">
diff --git a/resources/views/companies/edit.blade.php b/resources/views/companies/edit.blade.php
index 4bd123d7c9c2..c40aa3e80155 100644
--- a/resources/views/companies/edit.blade.php
+++ b/resources/views/companies/edit.blade.php
@@ -31,9 +31,9 @@
 </div>
 
 <fieldset name="color-preferences">
-    <x-form-legend help_text="{{ trans('general.tag_color_help') }}">
+    <x-form.legend help_text="{{ trans('general.tag_color_help') }}">
         {{ trans('general.tag_color') }}
-    </x-form-legend>
+    </x-form.legend>
     <!--  color -->
     <div class="form-group {{ $errors->has('tag_color') ? 'error' : '' }}">
         <label for="tag_color" class="col-md-3 control-label">
diff --git a/resources/views/departments/edit.blade.php b/resources/views/departments/edit.blade.php
index 0fd807729925..99db5f1dca2c 100644
--- a/resources/views/departments/edit.blade.php
+++ b/resources/views/departments/edit.blade.php
@@ -43,9 +43,9 @@
     </div>
 
     <fieldset name="color-preferences">
-        <x-form-legend help_text="{{ trans('general.tag_color_help') }}">
+        <x-form.legend help_text="{{ trans('general.tag_color_help') }}">
             {{ trans('general.tag_color') }}
-        </x-form-legend>
+        </x-form.legend>
         <!--  color -->
         <div class="form-group {{ $errors->has('tag_color') ? 'error' : '' }}">
             <label for="tag_color" class="col-md-3 control-label">
diff --git a/resources/views/groups/edit.blade.php b/resources/views/groups/edit.blade.php
index 24a653a94b48..40a2c14f9a04 100755
--- a/resources/views/groups/edit.blade.php
+++ b/resources/views/groups/edit.blade.php
@@ -41,9 +41,9 @@
 
 
 <fieldset>
-    <x-form-legend icon="warning" help_text="{{ (isset($all_users_count) && ($all_users_count < config('app.max_unpaginated_records'))) ? trans('general.add_users_to_group_help') : trans('admin/settings/general.too_many_users_to_show', ['count'=> $all_users_count, 'max' => config('app.max_unpaginated_records')]) }}">
+    <x-form.legend icon="warning" help_text="{{ (isset($all_users_count) && ($all_users_count < config('app.max_unpaginated_records'))) ? trans('general.add_users_to_group_help') : trans('admin/settings/general.too_many_users_to_show', ['count'=> $all_users_count, 'max' => config('app.max_unpaginated_records')]) }}">
        {{ trans('general.add_users_to_group') }}
-    </x-form-legend>
+    </x-form.legend>
 
 <!-- this is a temp fix for the select2 not working inside modals -->
 
diff --git a/resources/views/hardware/edit.blade.php b/resources/views/hardware/edit.blade.php
index d0e649012b2e..10a4527f4b47 100755
--- a/resources/views/hardware/edit.blade.php
+++ b/resources/views/hardware/edit.blade.php
@@ -138,12 +138,12 @@ class="col-md-3 control-label">{{ trans('admin/hardware/form.tag') }} {{ $i }}</
 
         <fieldset name="optional-details">
 
-            <x-form-legend>
+            <x-form.legend>
                 <a id="optional_info">
                     <x-icon type="caret-right" class="fa-fw" id="optional_info_icon" />
                     {{ trans('admin/hardware/form.optional_infos') }}
                 </a>
-            </x-form-legend>
+            </x-form.legend>
 
             <div id="optional_details" class="col-md-12" style="display:none">
                 @include ('partials.forms.edit.name', ['translated_name' => trans('admin/hardware/form.name')])
@@ -172,12 +172,12 @@ class="col-md-3 control-label">{{ trans('admin/hardware/form.tag') }} {{ $i }}</
 
     <div class="col-md-12 col-sm-12">
         <fieldset name="order-info">
-            <x-form-legend>
+            <x-form.legend>
                 <a id="order_info">
                     <x-icon type="caret-right" class="fa-fw" id="order_info_icon" />
                     {{ trans('admin/hardware/form.order_details') }}
                 </a>
-            </x-form-legend>
+            </x-form.legend>
 
             <div id='order_details' class="col-md-12" style="display:none">
                 @include ('partials.forms.edit.order_number')
diff --git a/resources/views/locations/edit.blade.php b/resources/views/locations/edit.blade.php
index 4a02a97a3cd3..0fa633bd8ee7 100755
--- a/resources/views/locations/edit.blade.php
+++ b/resources/views/locations/edit.blade.php
@@ -79,9 +79,9 @@
 </div>
 
 <fieldset name="color-preferences">
-    <x-form-legend help_text="{{ trans('general.tag_color_help') }}">
+    <x-form.legend help_text="{{ trans('general.tag_color_help') }}">
         {{ trans('general.tag_color') }}
-    </x-form-legend>
+    </x-form.legend>
     <!--  color -->
     <div class="form-group {{ $errors->has('tag_color') ? 'error' : '' }}">
         <label for="tag_color" class="col-md-3 control-label">
diff --git a/resources/views/manufacturers/edit.blade.php b/resources/views/manufacturers/edit.blade.php
index 7f9d37d7073a..5b4b64704874 100755
--- a/resources/views/manufacturers/edit.blade.php
+++ b/resources/views/manufacturers/edit.blade.php
@@ -15,14 +15,14 @@
         <x-box>
 
                 <!-- Name -->
-                <x-form-row
+                <x-form.row
                         :label="trans('admin/manufacturers/table.name')"
                         :$item
                         name="name"
                 />
 
                 <!-- URL -->
-                <x-form-row
+                <x-form.row
                         :label="trans('general.url')"
                         :$item
                         name="url"
@@ -33,7 +33,7 @@
                 />
 
                 <!-- Support URL -->
-                <x-form-row
+                <x-form.row
                         :label="trans('admin/manufacturers/table.support_url')"
                         :$item
                         name="support_url"
@@ -44,7 +44,7 @@
                 />
 
                 <!-- Warranty Lookup URL -->
-                <x-form-row
+                <x-form.row
                         :label="trans('admin/manufacturers/table.warranty_lookup_url')"
                         :$item
                         name="warranty_lookup_url"
@@ -56,7 +56,7 @@
                 />
 
                 <!-- Support Phone -->
-                <x-form-row
+                <x-form.row
                         :label="trans('admin/manufacturers/table.support_phone')"
                         :$item
                         name="support_phone"
@@ -69,7 +69,7 @@
 
 
                 <!-- Support Email -->
-                <x-form-row
+                <x-form.row
                         :label="trans('admin/manufacturers/table.support_email')"
                         :$item
                         name="support_email"
@@ -85,7 +85,7 @@
 
 
                 <!-- Notes -->
-                <x-form-row
+                <x-form.row
                         :label="trans('general.notes')"
                         :$item
                         name="notes"
@@ -94,9 +94,9 @@
                 />
 
                 <fieldset name="color-preferences">
-                    <x-form-legend help_text="{{ trans('general.tag_color_help') }}">
+                    <x-form.legend help_text="{{ trans('general.tag_color_help') }}">
                         {{ trans('general.tag_color') }}
-                    </x-form-legend>
+                    </x-form.legend>
                     <!--  color -->
                     <div class="form-group {{ $errors->has('tag_color') ? 'error' : '' }}">
                         <label for="tag_color" class="col-md-3 control-label">
diff --git a/resources/views/models/bulk-edit.blade.php b/resources/views/models/bulk-edit.blade.php
index afce8e4b282e..4108c1252bed 100644
--- a/resources/views/models/bulk-edit.blade.php
+++ b/resources/views/models/bulk-edit.blade.php
@@ -94,9 +94,9 @@ class="js-fieldset-field"
                                 <div class="col-md-9">
                                     <div class="form-inline" style="display: flex; align-items: center; gap: 8px;">
                                         <input type="checkbox" name="require_serial" value="1" id="require_serial" aria-label="require_serial" />
-                                        <x-form-tooltip>
+                                        <x-form.tooltip>
                                             {{ trans('admin/hardware/general.require_serial_help') }}
-                                        </x-form-tooltip>
+                                        </x-form.tooltip>
                                     </div>
                                 </div>
                             </div>
diff --git a/resources/views/models/custom_fields_form.blade.php b/resources/views/models/custom_fields_form.blade.php
index 5f0b14c22c42..7436259b4747 100644
--- a/resources/views/models/custom_fields_form.blade.php
+++ b/resources/views/models/custom_fields_form.blade.php
@@ -2,11 +2,11 @@
     <div class="col-md-12 col-sm-12">
 
     <fieldset name="custom-fields">
-        <x-form-legend
+        <x-form.legend
                 help_text="{!! trans('admin/custom_fields/general.general_help_text') !!}">
 
             {{ trans('admin/custom_fields/general.custom_fields') }}
-        </x-form-legend>
+        </x-form.legend>
 
   @foreach($model->fieldset->fields as $field)
     @if (!isset($show_custom_fields_type) || ($field->displayFieldInCurrentForm($show_custom_fields_type)))
diff --git a/resources/views/models/custom_fields_form_bulk_edit.blade.php b/resources/views/models/custom_fields_form_bulk_edit.blade.php
index 4a3704a3ee85..8a2cc9f68c4f 100644
--- a/resources/views/models/custom_fields_form_bulk_edit.blade.php
+++ b/resources/views/models/custom_fields_form_bulk_edit.blade.php
@@ -14,9 +14,9 @@
 
 @if ($anyModelHasCustomFields > 0)
     <fieldset name="custom-fields"">
-        <x-form-legend>
+        <x-form.legend>
             {{ trans('admin/custom_fields/general.custom_fields') }}
-        </x-form-legend>
+        </x-form.legend>
 @endif
 
 @foreach($models as $model)
diff --git a/resources/views/partials/forms/edit/minimum_quantity.blade.php b/resources/views/partials/forms/edit/minimum_quantity.blade.php
index 9f05ac00ab1e..3155b2885356 100644
--- a/resources/views/partials/forms/edit/minimum_quantity.blade.php
+++ b/resources/views/partials/forms/edit/minimum_quantity.blade.php
@@ -10,9 +10,9 @@
                    {{   (isset($item) && (Helper::checkIfRequired($item, 'min_amt')) ? ' required' : '') }}/>
         </div>
         <div class="col-md-7" style="margin-left: -15px;">
-            <x-form-tooltip>
+            <x-form.tooltip>
                 {{ trans('general.min_amt_help') }}
-            </x-form-tooltip>
+            </x-form.tooltip>
         </div>
         <div class="col-md-12">
            {!! $errors->first('min_amt', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
diff --git a/resources/views/settings/alerts.blade.php b/resources/views/settings/alerts.blade.php
index 83a63315aa2f..c6080285ad3b 100644
--- a/resources/views/settings/alerts.blade.php
+++ b/resources/views/settings/alerts.blade.php
@@ -42,9 +42,9 @@
 
 
                         <fieldset name="remote-login">
-                            <x-form-legend>
+                            <x-form.legend>
                                 {{ trans('admin/settings/general.legends.general') }}
-                            </x-form-legend>
+                            </x-form.legend>
 
                             <!-- Menu Alerts Enabled -->
                             <div class="form-group{{ $errors->has('show_alerts_in_menu') ? ' error' : '' }}">
@@ -69,9 +69,9 @@
                         </fieldset>
 
                         <fieldset name="alert-addresses">
-                            <x-form-legend>
+                            <x-form.legend>
                                 {{ trans('admin/settings/general.legends.email') }}
-                            </x-form-legend>
+                            </x-form.legend>
 
                             <!-- Alert Email -->
                             <div class="form-group {{ $errors->has('alert_email') ? 'error' : '' }}">
@@ -132,9 +132,9 @@
 
                         <fieldset name="remote-login">
 
-                            <x-form-legend>
+                            <x-form.legend>
                                 {{ trans('admin/settings/general.legends.intervals') }}
-                            </x-form-legend>
+                            </x-form.legend>
 
                             <!-- Inventory alert threshold -->
                             <div class="form-group {{ $errors->has('alert_threshold') ? 'error' : '' }}">
diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php
index 2b7bc61d7b37..4559b4fad7ad 100644
--- a/resources/views/settings/branding.blade.php
+++ b/resources/views/settings/branding.blade.php
@@ -73,9 +73,9 @@ class="form-horizontal"
                             </div>
 
                         <fieldset name="color-preferences">
-                            <x-form-legend help_text="{!! trans('admin/settings/general.color_settings_help') !!}">
+                            <x-form.legend help_text="{!! trans('admin/settings/general.color_settings_help') !!}">
                                 {{ trans('admin/settings/general.color_preferences') }}
-                            </x-form-legend>
+                            </x-form.legend>
 
                             <!-- Header color -->
                             <div class="form-group {{ $errors->has('header_color') ? 'error' : '' }}">
@@ -129,9 +129,9 @@ class="form-horizontal"
                         </fieldset>
 
                         <fieldset name="logo-preferences">
-                            <x-form-legend>
+                            <x-form.legend>
                                 {{ trans('admin/settings/general.legends.logos') }}
-                            </x-form-legend>
+                            </x-form.legend>
 
                             @php
                                 $optionTypes = trans('admin/settings/general.logo_option_types');
@@ -286,9 +286,9 @@ class="form-control"
                         <!-- colors and skins -->
 
                         <fieldset name="css-preferences">
-                            <x-form-legend>
+                            <x-form.legend>
                                 {{ trans('admin/settings/general.custom_css') }}
-                            </x-form-legend>
+                            </x-form.legend>
                             <!-- Custom css -->
                             <div class="form-group {{ $errors->has('custom_css') ? 'error' : '' }}">
 
@@ -324,9 +324,9 @@ class="form-control"
                             <!-- colors and skins -->
 
                             <fieldset name="footer-preferences">
-                                <x-form-legend>
+                                <x-form.legend>
                                     {{ trans('admin/settings/general.legends.footer') }}
-                                </x-form-legend>
+                                </x-form.legend>
 
                                 <!-- Support Footer -->
                                 <div class="form-group {{ $errors->has('support_footer') ? 'error' : '' }}">
diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php
index 167b72eb9cdf..b0353192ebee 100644
--- a/resources/views/settings/general.blade.php
+++ b/resources/views/settings/general.blade.php
@@ -35,9 +35,9 @@
                    <div class="col-md-12">
 
                        <fieldset>
-                           <x-form-legend>
+                           <x-form.legend>
                                {{ trans('admin/settings/general.legends.scoping') }}
-                           </x-form-legend>
+                           </x-form.legend>
                             <!-- Full Multiple Companies Support -->
                             <div class="form-group {{ $errors->has('full_multiple_companies_support') ? 'error' : '' }}">
                                 <div class="col-md-8 col-md-offset-3">
@@ -64,9 +64,9 @@
                        </fieldset>
 
                        <fieldset>
-                           <x-form-legend>
+                           <x-form.legend>
                                {{ trans('admin/settings/general.legends.formats') }}
-                           </x-form-legend>
+                           </x-form.legend>
                            <!-- Email domain -->
                            <div class="form-group {{ $errors->has('email_domain') ? 'error' : '' }}">
 
@@ -115,9 +115,9 @@
 
 
                        <fieldset>
-                           <x-form-legend>
+                           <x-form.legend>
                                {{ trans('admin/settings/general.legends.profiles') }}
-                           </x-form-legend>
+                           </x-form.legend>
                            <!-- user profile edit checkbox -->
                            <div class="form-group">
                                <div class="col-md-8 col-md-offset-3">
@@ -131,9 +131,9 @@
                        </fieldset>
 
                        <fieldset>
-                           <x-form-legend>
+                           <x-form.legend>
                                {{ trans('admin/settings/general.legends.eula') }}
-                           </x-form-legend>
+                           </x-form.legend>
 
                            <!-- Require signature for acceptance -->
                            <div class="form-group {{ $errors->has('require_accept_signature') ? 'error' : '' }}">
@@ -167,9 +167,9 @@
                        </fieldset>
 
                        <fieldset>
-                           <x-form-legend>
+                           <x-form.legend>
                                {{ trans('admin/settings/general.legends.misc_display') }}
-                           </x-form-legend>
+                           </x-form.legend>
 
                            <!-- Thumb Size -->
                            <div class="form-group {{ $errors->has('thumbnail_max_h') ? 'error' : '' }}">
@@ -248,9 +248,9 @@
 
 
                        <fieldset>
-                           <x-form-legend>
+                           <x-form.legend>
                                {{ trans('general.email') }}
-                           </x-form-legend>
+                           </x-form.legend>
 
                            <!-- Mail test -->
                            <div class="form-group">
@@ -292,9 +292,9 @@
 
 
                        <fieldset name="checkin-preferences"">
-                           <x-form-legend>
+                           <x-form.legend>
                                {{ trans('admin/settings/general.legends.checkin') }}
-                           </x-form-legend>
+                           </x-form.legend>
 
                            <!-- Require Notes on checkin/checkout checkbox -->
                                <div class="form-group">
@@ -313,9 +313,9 @@
 
 
                        <fieldset name="dashboard">
-                           <x-form-legend>
+                           <x-form.legend>
                                {{ trans('admin/settings/general.legends.dashboard') }}
-                           </x-form-legend>
+                           </x-form.legend>
 
                            <!-- login text -->
                            <div class="form-group {{ $errors->has('login_note') ? 'error' : '' }}">
@@ -375,9 +375,9 @@
 
 
                        <fieldset>
-                           <x-form-legend>
+                           <x-form.legend>
                                {{ trans('admin/settings/general.legends.misc') }}
-                           </x-form-legend>
+                           </x-form.legend>
 
                            <!-- Privacy Policy Footer-->
                            <div class="form-group {{ $errors->has('privacy_policy_link') ? 'error' : '' }}">
diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index f20ec46c5453..e3651ad33423 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -64,9 +64,9 @@
                             <!-- New Settings -->
 
                         <fieldset name="select-template">
-                            <x-form-legend>
+                            <x-form.legend>
                                 {{ trans('admin/settings/general.select_template') }}
-                            </x-form-legend>
+                            </x-form.legend>
 
                             <!-- Template -->
                             <div class="form-group{{ $errors->has('label2_template') ? ' has-error' : '' }}">
@@ -104,9 +104,9 @@ class="table table-striped snipe-table"
                         </fieldset>
 
                         <fieldset name="label-settings">
-                            <x-form-legend help_text="{{ trans('admin/settings/general.labels_title_help') }}">
+                            <x-form.legend help_text="{{ trans('admin/settings/general.labels_title_help') }}">
                                 {{ trans('admin/settings/general.labels_title') }}
-                            </x-form-legend>
+                            </x-form.legend>
 
                             <!-- Title -->
                             <div class="form-group{{ $errors->has('label2_title') ? ' has-error' : '' }}">
@@ -367,9 +367,9 @@ class="form-control"
 
 
                         <fieldset name="field-definitions">
-                            <x-form-legend help_text="{!! trans('admin/settings/general.label2_fields_help') !!}">
+                            <x-form.legend help_text="{!! trans('admin/settings/general.label2_fields_help') !!}">
                                Label Fields
-                            </x-form-legend>
+                            </x-form.legend>
                             <!-- Fields -->
                             <div class="form-group {{ $errors->has('label2_fields') ? 'error' : '' }}">
                                 <div class="col-md-12">
@@ -381,9 +381,9 @@ class="form-control"
                     </fieldset>
 
                     <fieldset name="label-preview">
-                        <x-form-legend>
+                        <x-form.legend>
                             Label Preview
-                        </x-form-legend>
+                        </x-form.legend>
                             <div class="col-md-12" style="margin-bottom: 10px;">
                                 @include('partials.label2-preview')
                             </div>
diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php
index 9b4b27ce9450..447d05c88473 100644
--- a/resources/views/settings/ldap.blade.php
+++ b/resources/views/settings/ldap.blade.php
@@ -94,9 +94,9 @@
                     <div class="col-md-12">
 
                         <fieldset>
-                            <x-form-legend>
+                            <x-form.legend>
                                 {{ trans('admin/settings/general.legends.server') }}
-                            </x-form-legend>
+                            </x-form.legend>
                                 <!-- Enable LDAP -->
                                 <div class="form-group {{ $errors->has('ldap_integration') ? 'error' : '' }}">
                                     <div class="col-md-3 control-label">
@@ -496,10 +496,10 @@
 
                         <fieldset>
 
-                            <x-form-legend
+                            <x-form.legend
                             help_text="{!! trans('admin/settings/general.ldap_mapping_help') !!}">
                                 {{ trans('admin/settings/general.legends.mapping') }}
-                            </x-form-legend>
+                            </x-form.legend>
 
 
                             <!-- LDAP  username field-->
@@ -896,10 +896,10 @@
                         </fieldset>
 
                         <fieldset id="ldap_test_settings">
-                            <x-form-legend
+                            <x-form.legend
                                help_text="{{ trans('admin/settings/general.save_ldap_first') }}">
                                         {{ trans('admin/settings/general.legends.test') }}
-                            </x-form-legend>
+                            </x-form.legend>
                             @if ($setting->ldap_enabled)
 
                                 <!-- LDAP Login test -->
@@ -959,9 +959,9 @@
 
 
                         <fieldset>
-                            <x-form-legend>
+                            <x-form.legend>
                                 {{ trans('admin/settings/general.legends.misc') }}
-                            </x-form-legend>
+                            </x-form.legend>
 
                                 <!-- LDAP Forgotten password -->
                                 <div class="form-group {{ $errors->has('custom_forgot_pass_url') ? 'error' : '' }}">
diff --git a/resources/views/settings/security.blade.php b/resources/views/settings/security.blade.php
index 48a1249f2dae..8ff7127cab42 100644
--- a/resources/views/settings/security.blade.php
+++ b/resources/views/settings/security.blade.php
@@ -38,9 +38,9 @@
                     <div class="col-md-12">
 
                         <fieldset name="password-preferences">
-                            <x-form-legend>
+                            <x-form.legend>
                                 {{ trans('admin/settings/general.legends.security') }}
-                            </x-form-legend>
+                            </x-form.legend>
 
                             <!-- Two Factor -->
                             <div class="form-group {{ $errors->has('brand') ? 'error' : '' }}">
@@ -67,9 +67,9 @@
                                 </div>
                             </div>
 
-                            <x-form-legend>
+                            <x-form.legend>
                                 {{ trans('admin/settings/general.legends.passwords') }}
-                            </x-form-legend>
+                            </x-form.legend>
 
                             <!-- Min characters -->
                             <div class="form-group {{ $errors->has('pwd_secure_min') ? 'error' : '' }}">
@@ -129,9 +129,9 @@
                         </fieldset>
 
                         <fieldset name="remote-login">
-                            <x-form-legend>
+                            <x-form.legend>
                                 {{ trans('admin/settings/general.login_remote_user_text') }}
-                            </x-form-legend>
+                            </x-form.legend>
 
                             <!-- Remote User Authentication -->
                             <div class="form-group {{ $errors->has('login_remote_user') ? 'error' : '' }}">
diff --git a/resources/views/suppliers/edit.blade.php b/resources/views/suppliers/edit.blade.php
index 254c2de8f334..d4ee283d3694 100755
--- a/resources/views/suppliers/edit.blade.php
+++ b/resources/views/suppliers/edit.blade.php
@@ -37,9 +37,9 @@
 @include ('partials.forms.edit.image-upload', ['image_path' => app('suppliers_upload_path')])
 
 <fieldset name="color-preferences">
-    <x-form-legend help_text="{{ trans('general.tag_color_help') }}">
+    <x-form.legend help_text="{{ trans('general.tag_color_help') }}">
         {{ trans('general.tag_color') }}
-    </x-form-legend>
+    </x-form.legend>
     <!--  color -->
     <div class="form-group {{ $errors->has('tag_color') ? 'error' : '' }}">
         <label for="tag_color" class="col-md-3 control-label">
diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index bda043514db4..cd4da9c8974c 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -299,12 +299,12 @@
 
                       <fieldset>
 
-                          <x-form-legend>
+                          <x-form.legend>
                               <h4 id="optional_user_details" class="remember-toggle">
                                   <x-icon type="caret-down" class="fa-fw" id="toggle-arrow-optional_user_details" />
                                   {{ trans('admin/hardware/form.optional_infos') }}
                               </h4>
-                          </x-form-legend>
+                          </x-form.legend>
 
                           <div class="col-md-12 toggle-content-optional_user_details">