diff --git a/resources/views/partials/forms/edit/maintenance_type.blade.php b/resources/views/partials/forms/edit/maintenance_type.blade.php
index 24d008fa2..b82bead76 100644
--- a/resources/views/partials/forms/edit/maintenance_type.blade.php
+++ b/resources/views/partials/forms/edit/maintenance_type.blade.php
@@ -3,7 +3,14 @@
               <label for="asset_maintenance_type" class="col-md-3 control-label">{{ trans('admin/asset_maintenances/form.asset_maintenance_type') }}
               </label>
               <div class="col-md-7">
-                  {{ Form::select('asset_maintenance_type', $assetMaintenanceType , old('asset_maintenance_type', $item->asset_maintenance_type), ['class'=>'select2', 'aria-label'=>'asset_maintenance_type', 'required' => Helper::checkIfRequired($item, 'asset_maintenance_type') ? true : '', 'style'=> 'width:100%;']) }}
+                  <x-input.select
+                      name="asset_maintenance_type"
+                      :options="$assetMaintenanceType"
+                      :selected="old('asset_maintenance_type', $item->asset_maintenance_type)"
+                      :required="Helper::checkIfRequired($item, 'asset_maintenance_type')"
+                      style="width:100%;"
+                      aria-label="asset_maintenance_type"
+                  />
                   {!! $errors->first('asset_maintenance_type', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
               </div>
           </div>
diff --git a/resources/views/partials/forms/edit/status.blade.php b/resources/views/partials/forms/edit/status.blade.php
index 8554f9a59..01dd14612 100644
--- a/resources/views/partials/forms/edit/status.blade.php
+++ b/resources/views/partials/forms/edit/status.blade.php
@@ -2,7 +2,16 @@
 <div class="form-group {{ $errors->has('status_id') ? ' has-error' : '' }}">
     <label for="status_id" class="col-md-3 control-label">{{ trans('admin/hardware/form.status') }}</label>
     <div class="col-md-7 col-sm-11">
-        {{ Form::select('status_id', $statuslabel_list , old('status_id', $item->status_id), array('class'=>'select2 status_id', 'style'=>'width:100%','id'=>'status_select_id', 'aria-label'=>'status_id', 'required' => 'required')) }}
+        <x-input.select
+            name="status_id"
+            id="status_select_id"
+            :options="$statuslabel_list"
+            :selected="old('status_id', $item->status_id)"
+            :required="$required"
+            class="status_id"
+            style="width:100%;"
+            aria-label="status_id"
+        />
         {!! $errors->first('status_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
     <div class="col-md-2 col-sm-2 text-left">
diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php
index c586917ef..be6120a4f 100644
--- a/resources/views/settings/branding.blade.php
+++ b/resources/views/settings/branding.blade.php
@@ -67,7 +67,14 @@
                                  {{ Form::label('brand', trans('admin/settings/general.web_brand')) }}
                             </div>
                             <div class="col-md-9">
-                                {!! Form::select('brand', array('1'=>'Text','2'=>'Logo','3'=>'Logo + Text'), old('brand', $setting->brand), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!}
+                                <x-input.select
+                                    name="brand"
+                                    id="brand"
+                                    :options="['1'=>'Text','2'=>'Logo','3'=>'Logo + Text']"
+                                    :selected="old('brand', $setting->brand)"
+                                    class="form-control"
+                                    style="width: 150px"
+                                />
                                 {!! $errors->first('brand', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                             </div>
                         </div>
@@ -252,10 +259,25 @@
                             </div>
                             <div class="col-md-9">
                                 @if (config('app.lock_passwords')===true)
-                                    {!! Form::select('support_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), old('support_footer', $setting->support_footer), ['class' => 'form-control select2 disabled', 'style'=>'width: 150px ;', 'disabled' => 'disabled']) !!}
+                                    <x-input.select
+                                        name="support_footer"
+                                        id="support_footer"
+                                        :options="['on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only']"
+                                        :selected="old('support_footer', $setting->support_footer)"
+                                        disabled
+                                        class="form-control disabled"
+                                        style="width: 150px"
+                                    />
                                     <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
                                 @else
-                                    {!! Form::select('support_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), old('support_footer', $setting->support_footer), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!}
+                                    <x-input.select
+                                        name="support_footer"
+                                        id="support_footer"
+                                        :options="['on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only']"
+                                        :selected="old('support_footer', $setting->support_footer)"
+                                        class="form-control"
+                                        style="width: 150px"
+                                    />
                                 @endif
 
 
@@ -271,10 +293,25 @@
                             </div>
                             <div class="col-md-9">
                                 @if (config('app.lock_passwords')===true)
-                                    {!! Form::select('version_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), old('version_footer', $setting->version_footer), ['class' => 'form-control select2 disabled', 'style'=>'width: 150px ;', 'disabled' => 'disabled']) !!}
+                                    <x-input.select
+                                        name="version_footer"
+                                        id="version_footer"
+                                        :options="['on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only']"
+                                        :selected="old('version_footer', $setting->version_footer)"
+                                        disabled
+                                        class="form-control disabled"
+                                        style="width: 150px"
+                                    />
                                     <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
                                 @else
-                                    {!! Form::select('version_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), old('version_footer', $setting->version_footer), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!}
+                                    <x-input.select
+                                        name="version_footer"
+                                        id="version_footer"
+                                        :options="['on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only']"
+                                        :selected="old('version_footer', $setting->version_footer)"
+                                        class="form-control"
+                                        style="width: 150px"
+                                    />
                                 @endif
 
                                 <p class="help-block">{{ trans('admin/settings/general.version_footer_help') }}</p>