diff --git a/public/css/build/app.css b/public/css/build/app.css
index b67a5f6a1c..4998dda6bc 100644
Binary files a/public/css/build/app.css and b/public/css/build/app.css differ
diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css
index 7d0450d520..6a74807f5d 100644
Binary files a/public/css/build/overrides.css and b/public/css/build/overrides.css differ
diff --git a/public/css/dist/all.css b/public/css/dist/all.css
index f1f0b46d30..1f596af4e3 100644
Binary files a/public/css/dist/all.css and b/public/css/dist/all.css differ
diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less
index eb90f1b850..516bf4f3c3 100644
--- a/resources/assets/less/overrides.less
+++ b/resources/assets/less/overrides.less
@@ -666,9 +666,6 @@ th.css-accessory > .th-inner::before
   border-radius: 0px;
 }
 
-.bs-checkbox input {
-  zoom: 1.5;
-}
 @media screen and (max-width: 511px){
   .sidebar-menu{
     margin-top:160px;
@@ -690,4 +687,119 @@ th.css-accessory > .th-inner::before
   overflow: hidden;
   white-space: nowrap;
   text-overflow: ellipsis;
-}
\ No newline at end of file
+}
+
+
+/** form-stuff overrides for checkboxes and stuff **/
+
+.form-control--disabled {
+  color: #959495;
+  pointer-events:none;
+  cursor: not-allowed;
+
+}
+
+label.form-control {
+  font-weight: bold;
+  display: grid;
+  grid-template-columns: 1.8em auto;
+  gap: 0.5em;
+  border: 0px;
+  padding-left: 0px;
+}
+
+/** Checkbox style to replace iCheck **/
+input[type="checkbox"] {
+  /* Add if not using autoprefixer */
+  -webkit-appearance: none;
+  appearance: none;
+  /* For iOS < 15 to remove gradient background */
+  background-color: #fff;
+  /* Not removed via appearance */
+  margin: 0;
+  font: inherit;
+  color: #959495;
+  width: 1.8em;
+  height: 1.8em;
+  border: 0.05em solid;
+  border-radius: 0em;
+  transform: translateY(-0.075em);
+  display: grid;
+  place-content: center;
+  /*Windows High Contrast Mode*/
+}
+
+
+input[type="checkbox"]::before {
+
+/** If you want to use the non-checkbox, filled square, use this instead **/
+//  content: "";
+//  width: 1em;
+//  height: 1em;
+//  transform: scale(0);
+//  transition: 120ms transform ease-in-out;
+//  box-shadow: inset 1em 1em #428bca;
+
+  content: "";
+  width: 1em;
+  height: 1em;
+  clip-path: polygon(14% 44%, 0 65%, 50% 100%, 100% 16%, 80% 0%, 43% 62%);
+  transform: scale(0);
+  transform-origin: bottom left;
+  transition: 120ms transform ease-in-out;
+  box-shadow: inset 1em 1em #428bca;
+  /* Windows High Contrast Mode */
+  background-color: CanvasText;
+}
+
+input[type="checkbox"]:checked::before {
+  transform: scale(1);
+}
+
+input[type=checkbox]:disabled::before, input[type=radio]:disabled::before {
+  content: "";
+  width: 1em;
+  height: 1em;
+  transform: scale(1);
+  box-shadow: inset 1em 1em #959495;
+}
+
+
+input[type=checkbox]:disabled, input[type=radio]:disabled {
+  --form-control-color: #959495;
+  color: #959495;
+  cursor: not-allowed;
+  pointer-events:none;
+}
+
+
+/** Radio style to replace iCheck **/
+
+input[type="radio"] {
+  appearance: none;
+  background-color: #fff;
+  margin: 0;
+  font: inherit;
+  color: #959495;
+  width: 1.8em;
+  height: 1.8em;
+  border: 0.05em solid;
+  border-radius: 50%;
+  transform: translateY(-0.075em);
+  display: grid;
+  place-content: center;
+}
+
+input[type="radio"]::before {
+  content: "";
+  width: 1em;
+  height: 1em;
+  border-radius: 50%;
+  transform: scale(0);
+  transition: 120ms transform ease-in-out;
+  box-shadow: inset 1em 1em #428bca;
+}
+
+input[type="radio"]:checked::before {
+  transform: scale(1);
+}
diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php
index 1cacc4086f..2f9ce043e5 100755
--- a/resources/views/hardware/bulk.blade.php
+++ b/resources/views/hardware/bulk.blade.php
@@ -31,16 +31,16 @@
           <!-- Purchase Date -->
           <div class="form-group {{ $errors->has('purchase_date') ? ' has-error' : '' }}">
             <label for="purchase_date" class="col-md-3 control-label">{{ trans('admin/hardware/form.date') }}</label>
-            <div class="col-md-3">
+            <div class="col-md-4">
               <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
                 <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="purchase_date" id="purchase_date" value="{{ old('purchase_date') }}">
                 <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
               </div>
               {!! $errors->first('purchase_date', '<span class="alert-msg"><i class="fas fa-times"></i> :message</span>') !!}
             </div>
-            <div class="col-md-6">
-              <label>
-                {{ Form::checkbox('null_purchase_date', '1', false, ['class' => 'minimal']) }}
+            <div class="col-md-5">
+              <label class="form-control">
+                {{ Form::checkbox('null_purchase_date', '1', false) }}
                 {{ trans_choice('general.set_to_null', count($assets),['asset_count' => count($assets)]) }}
               </label>
             </div>
@@ -49,7 +49,7 @@
           <!-- Expected Checkin Date -->
           <div class="form-group {{ $errors->has('expected_checkin') ? ' has-error' : '' }}">
              <label for="expected_checkin" class="col-md-3 control-label">{{ trans('admin/hardware/form.expected_checkin') }}</label>
-             <div class="col-md-3">
+             <div class="col-md-4">
                   <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
                       <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="expected_checkin" id="expected_checkin" value="{{ old('expected_checkin') }}">
                       <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
@@ -57,9 +57,9 @@
 
                  {!! $errors->first('expected_checkin', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
              </div>
-              <div class="col-md-6">
-                <label>
-                  {{ Form::checkbox('null_expected_checkin_date', '1', false, ['class' => 'minimal']) }}
+              <div class="col-md-5">
+                <label class="form-control">
+                  {{ Form::checkbox('null_expected_checkin_date', '1', false, ['disabled' => 'true', 'checked' => 'false']) }}
                   {{ trans_choice('general.set_to_null', count($assets), ['asset_count' => count($assets)]) }}
                 </label>
               </div>
@@ -72,7 +72,7 @@
               {{ trans('admin/hardware/form.status') }}
             </label>
             <div class="col-md-7">
-              {{ Form::select('status_id', $statuslabel_list , old('status_id'), array('class'=>'select2', 'style'=>'width:350px', 'aria-label'=>'status_id')) }}
+              {{ Form::select('status_id', $statuslabel_list , old('status_id'), array('class'=>'select2', '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>
@@ -86,14 +86,12 @@
           <div class="form-group">
             <div class="col-md-3"></div>
             <div class="col-md-9">
-
-                <label for="update_real_loc">
-                  {{ Form::radio('update_real_loc', '1', old('update_real_loc'), ['class'=>'minimal', 'aria-label'=>'update_real_loc']) }}
+                <label class="form-control form-control--disabled">
+                  {{ Form::radio('update_real_loc', '1', old('update_real_loc'), ['checked'=> 'checked', 'aria-label'=>'update_real_loc']) }}
                   {{ trans('admin/hardware/form.asset_location_update_default_current') }}
                 </label>
-                <br>
-                <label for="update_default_loc">
-                  {{ Form::radio('update_real_loc', '0', old('update_real_loc'), ['class'=>'minimal', 'aria-label'=>'update_default_loc']) }}
+                <label class="form-control">
+                  {{ Form::radio('update_real_loc', '0', old('update_real_loc'), ['aria-label'=>'update_default_loc']) }}
                   {{ trans('admin/hardware/form.asset_location_update_default') }}
                 </label>
 
@@ -147,17 +145,18 @@
           <!-- Next audit Date -->
           <div class="form-group {{ $errors->has('next_audit_date') ? ' has-error' : '' }}">
             <label for="next_audit_date" class="col-md-3 control-label">{{ trans('general.next_audit_date') }}</label>
-            <div class="col-md-3">
+            <div class="col-md-4">
               <div class="input-group date" data-provide="datepicker" data-date-format="yyyy-mm-dd"  data-autoclose="true">
                 <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="next_audit_date" id="next_audit_date" value="{{ old('next_audit_date') }}">
                 <span class="input-group-addon"><i class="fas fa-calendar" aria-hidden="true"></i></span>
               </div>
 
-              {!! $errors->first('next_audit_date', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
+              {!! $errors->first('next_audit_date', '<span class="alert-msg" aria-hidden="true">
+                <i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
             </div>
-            <div class="col-md-6">
-              <label>
-                {{ Form::checkbox('null_next_audit_date', '1', false, ['class' => 'minimal']) }}
+            <div class="col-md-5">
+              <label class="form-control">
+                {{ Form::checkbox('null_next_audit_date', '1', false) }}
                 {{ trans_choice('general.set_to_null', count($assets), ['asset_count' => count($assets)]) }}
               </label>
             </div>
@@ -169,14 +168,17 @@
               <strong>{{ trans('admin/hardware/form.requestable') }}</strong>
             </div>
             <div class="col-md-7">
-              <label class="radio">
-                <input type="radio" class="minimal" name="requestable" value="1"> {{ trans('general.yes')}}
+              <label class="form-control">
+                <input type="radio" name="requestable" value="1">
+                {{ trans('general.yes')}}
               </label>
-              <label class="radio">
-                <input type="radio" class="minimal" name="requestable" value="0"> {{ trans('general.no')}}
+              <label class="form-control">
+                <input type="radio" name="requestable" value="0">
+                {{ trans('general.no')}}
               </label>
-              <label class="radio">
-                <input type="radio" class="minimal" name="requestable" value="" checked> {{ trans('general.do_not_change')}}
+              <label class="form-control">
+                <input type="radio" name="requestable" value="" checked>
+                {{ trans('general.do_not_change')}}
               </label>
             </div>
           </div>