diff --git a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php
index 20a9a6205..26490697a 100755
--- a/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php
+++ b/packages/Webkul/Admin/src/Http/Controllers/Customer/CustomerController.php
@@ -165,7 +165,11 @@ class CustomerController extends Controller
             'date_of_birth' => 'date|before:today',
         ]);
 
-        $this->customerRepository->update(request()->all(), $id);
+        $data = request()->all();
+
+        $data['status'] = ! isset($data['status']) ? 0 : 1;
+
+        $this->customerRepository->update($data, $id);
 
         session()->flash('success', trans('admin::app.response.update-success', ['name' => 'Customer']));
 
diff --git a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
index cb26e7193..0a1459d8a 100755
--- a/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/customers/edit.blade.php
@@ -68,10 +68,12 @@
 
                             <div class="control-group">
                                 <label for="status" class="required">{{ __('admin::app.customers.customers.status') }}</label>
-                                <select name="status" class="control" value="{{ $customer->status }}" v-validate="'required'" data-vv-as="&quot;{{ __('admin::app.customers.customers.status') }}&quot;">
-                                    <option value="1" {{ $customer->status == "1" ? 'selected' : '' }}>{{ __('admin::app.customers.customers.active') }}</option>
-                                    <option value="0" {{ $customer->status == "0" ? 'selected' : '' }}>{{ __('admin::app.customers.customers.in-active') }}</option>
-                                </select>
+                                    
+                                <label class="switch">
+                                    <input type="checkbox" id="status" name="status" value="{{ $customer->status }}" {{ $customer->status ? 'checked' : '' }}>
+                                    <span class="slider round"></span>
+                                </label>
+
                                 <span class="control-error" v-if="errors.has('status')">@{{ errors.first('status') }}</span>
                             </div>
 
diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php
index 6ced9889a..96a51f118 100644
--- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/create.blade.php
@@ -56,11 +56,11 @@
 
                                 <div class="control-group">
                                     <label for="status">{{ __('admin::app.promotions.cart-rules.status') }}</label>
-                                    <span class="checkbox">
-                                        <input type="checkbox" id="status" name="status" value="1">
-                                        <label class="checkbox-view" for="status"></label>
-                                        {{ __('admin::app.promotions.cart-rules.is-active') }}
-                                    </span>
+                                    
+                                    <label class="switch">
+                                        <input type="checkbox" id="status" name="status" value="1" {{ old('status') ? 'checked' : '' }}>
+                                        <span class="slider round"></span>
+                                    </label>
                                 </div>
 
                                 <div class="control-group" :class="[errors.has('channels[]') ? 'has-error' : '']">
diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/edit.blade.php
index 2ea23c5ce..0d921deaf 100644
--- a/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/promotions/cart-rules/edit.blade.php
@@ -56,11 +56,11 @@
 
                                 <div class="control-group">
                                     <label for="status">{{ __('admin::app.promotions.cart-rules.status') }}</label>
-                                    <span class="checkbox">
-                                        <input type="checkbox" id="status" name="status" value="{{ old('status') ?: $cartRule->status }}" {{ $cartRule->status ? 'checked' : '' }}>
-                                        <label class="checkbox-view" for="status"></label>
-                                        {{ __('admin::app.promotions.cart-rules.is-active') }}
-                                    </span>
+                                    
+                                    <label class="switch">
+                                        <input type="checkbox" id="status" name="status" value="{{ $cartRule->status }}" {{ $cartRule->status ? 'checked' : '' }}>
+                                        <span class="slider round"></span>
+                                    </label>
                                 </div>
 
                                 <div class="control-group" :class="[errors.has('channels[]') ? 'has-error' : '']">
diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rules/create.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rules/create.blade.php
index 30745564b..1203a8bc0 100644
--- a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rules/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rules/create.blade.php
@@ -56,11 +56,11 @@
 
                                 <div class="control-group">
                                     <label for="status">{{ __('admin::app.promotions.catalog-rules.status') }}</label>
-                                    <span class="checkbox">
-                                        <input type="checkbox" id="status" name="status" value="1">
-                                        <label class="checkbox-view" for="status"></label>
-                                        {{ __('admin::app.promotions.catalog-rules.is-active') }}
-                                    </span>
+                                    
+                                    <label class="switch">
+                                        <input type="checkbox" id="status" name="status" value="1" {{ old('status') ? 'checked' : '' }}>
+                                        <span class="slider round"></span>
+                                    </label>
                                 </div>
 
                                 <div class="control-group" :class="[errors.has('channels[]') ? 'has-error' : '']">
diff --git a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rules/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rules/edit.blade.php
index 81d1fe839..f76b276b6 100644
--- a/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rules/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/promotions/catalog-rules/edit.blade.php
@@ -56,11 +56,11 @@
 
                                 <div class="control-group">
                                     <label for="status">{{ __('admin::app.promotions.catalog-rules.status') }}</label>
-                                    <span class="checkbox">
+                                    
+                                    <label class="switch">
                                         <input type="checkbox" id="status" name="status" value="{{ $catalogRule->status }}" {{ $catalogRule->status ? 'checked' : '' }}>
-                                        <label class="checkbox-view" for="status"></label>
-                                        {{ __('admin::app.promotions.catalog-rules.is-active') }}
-                                    </span>
+                                        <span class="slider round"></span>
+                                    </label>
                                 </div>
 
                                 <div class="control-group" :class="[errors.has('channels[]') ? 'has-error' : '']">
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php
index 67b2a8615..63d4b856e 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/create.blade.php
@@ -67,11 +67,11 @@
 
                             <div class="control-group">
                                 <label for="status">{{ __('admin::app.settings.inventory_sources.status') }}</label>
-                                <span class="checkbox">
-                                    <input type="checkbox" id="status" name="status" value="1">
-                                    <label class="checkbox-view" for="status"></label>
-                                    {{ __('admin::app.settings.inventory_sources.source-is-active') }}
-                                </span>
+
+                                <label class="switch">
+                                    <input type="checkbox" id="status" name="status" value="1" {{ old('status') ? 'checked' : '' }}>
+                                    <span class="slider round"></span>
+                                </label>
                             </div>
 
                         </div>
diff --git a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php
index 913a065a5..2a182e2cd 100755
--- a/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/settings/inventory_sources/edit.blade.php
@@ -69,11 +69,11 @@
 
                             <div class="control-group">
                                 <label for="status">{{ __('admin::app.settings.inventory_sources.status') }}</label>
-                                <span class="checkbox">
+
+                                <label class="switch">
                                     <input type="checkbox" id="status" name="status" value="{{ $inventorySource->status }}" {{ $inventorySource->status ? 'checked' : '' }}>
-                                    <label class="checkbox-view" for="status"></label>
-                                    {{ __('admin::app.settings.inventory_sources.source-is-active') }}
-                                </span>
+                                    <span class="slider round"></span>
+                                </label>
                             </div>
 
                         </div>
diff --git a/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/edit.blade.php
index 50d7df256..178246b22 100755
--- a/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/tax/tax-categories/edit.blade.php
@@ -1,7 +1,7 @@
 @extends('admin::layouts.content')
 
 @section('page_title')
-    {{ __('admin::app.settings.tax-categories.title') }}
+    {{ __('admin::app.settings.tax-categories.edit.title') }}
 @stop
 
 @section('content')
@@ -48,13 +48,21 @@
 
                         <input v-validate="'required'" class="control" id="code" name="code" data-vv-as="&quot;{{ __('admin::app.configuration.tax-categories.code') }}&quot;" value="{{ old('code') ?: $taxCategory->code }}"/>
 
+                        <span class="control-error" v-if="errors.has('code')">@{{ errors.first('code') }}</span>
+                    </div>
+
                     <div class="control-group" :class="[errors.has('name') ? 'has-error' : '']">
                         <label for="name" class="required">{{ __('admin::app.settings.tax-categories.name') }}</label>
                         <input v-validate="'required'" class="control" id="name" name="name" data-vv-as="&quot;{{ __('admin::app.configuration.tax-categories.name') }}&quot;" value="{{ old('name') ?: $taxCategory->name }}"/>
 
+                        <span class="control-error" v-if="errors.has('name')">@{{ errors.first('name') }}</span>
+                    </div>
+
                     <div class="control-group" :class="[errors.has('description') ? 'has-error' : '']">
                         <label for="description" class="required">{{ __('admin::app.settings.tax-categories.description') }}</label>
                         <textarea v-validate="'required'" class="control" id="description" name="description" data-vv-as="&quot;{{ __('admin::app.configuration.tax-categories.description') }}&quot;">{{ $taxCategory->description }}</textarea>
+
+                        <span class="control-error" v-if="errors.has('description')">@{{ errors.first('description') }}</span>
                     </div>
 
                     <?php $selectedOptions = old('taxrates') ?: $taxCategory->tax_rates()->pluck('tax_rates.id')->toArray() ?>
diff --git a/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php b/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php
index ad7e0d48a..e801b7524 100755
--- a/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/tax/tax-rates/create.blade.php
@@ -48,14 +48,15 @@
             <country-state></country-state>
 
             <div class="control-group">
-                <span class="checkbox">
+                <label for="zip_code">{{ __('admin::app.configuration.tax-rates.is_zip') }}</label>
+
+                <label class="switch">
                     <input type="checkbox" id="is_zip" name="is_zip" v-model="is_zip">
-                    <label class="checkbox-view" for="is_zip"></label>
-                    {{ __('admin::app.settings.tax-rates.is_zip') }}
-                </span>
+                    <span class="slider round"></span>
+                </label>
             </div>
 
-            <div v-if="!is_zip" class="control-group" :class="[errors.has('zip_code') ? 'has-error' : '']" id="zip_code">
+            <div v-if="! is_zip" class="control-group" :class="[errors.has('zip_code') ? 'has-error' : '']" id="zip_code">
                 <label for="zip_code" class="required">{{ __('admin::app.configuration.tax-rates.zip_code') }}</label>
                 <input v-validate="'required'" class="control" id="zip_code" name="zip_code" data-vv-as="&quot;{{ __('admin::app.configuration.tax-rates.zip_code') }}&quot;" value="{{ old('zip_code') }}"/>
                 <span class="control-error" v-if="errors.has('zip_code')">@{{ errors.first('zip_code') }}</span>
diff --git a/packages/Webkul/Admin/src/Resources/views/users/users/create.blade.php b/packages/Webkul/Admin/src/Resources/views/users/users/create.blade.php
index a7bf810c3..794a66aab 100755
--- a/packages/Webkul/Admin/src/Resources/views/users/users/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/users/users/create.blade.php
@@ -73,11 +73,11 @@
 
                             <div class="control-group">
                                 <label for="status">{{ __('admin::app.users.users.status') }}</label>
-                                <span class="checkbox">
-                                    <input type="checkbox" id="status" name="status" value="1">
-                                    <label class="checkbox-view" for="status"></label>
-                                    {{ __('admin::app.users.users.account-is-active') }}
-                                </span>
+                               
+                                <label class="switch">
+                                    <input type="checkbox" id="status" name="status" value="1" {{ old('status') ? 'checked' : '' }}>
+                                    <span class="slider round"></span>
+                                </label>
                             </div>
                         </div>
                     </accordian>
diff --git a/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php b/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php
index 61d6c7716..eecd3aa26 100755
--- a/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/users/users/edit.blade.php
@@ -74,19 +74,11 @@
 
                             <div class="control-group">
                                 <label for="status">{{ __('admin::app.users.users.status') }}</label>
-                                <span class="checkbox">
-                                    <input type="checkbox" id="status" name="status"
-                                    {{-- @if ($user->status == 0)
-                                        value="false"
-                                    @else
-                                        value="true"
-                                    @endif --}}
-
-                                    {{ $user->status ? 'checked' : '' }}>
-
-                                    <label class="checkbox-view" for="status"></label>
-                                    {{ __('admin::app.users.users.account-is-active') }}
-                                </span>
+                                
+                                <label class="switch">
+                                    <input type="checkbox" id="status" name="status" value="{{ $user->status }}" {{ $user->status ? 'checked' : '' }}>
+                                    <span class="slider round"></span>
+                                </label>
                             </div>
                         </div>
                     </accordian>