diff --git a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php
index 0a68c7d80..62433d785 100755
--- a/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php
+++ b/packages/Webkul/Admin/src/DataGrids/OrderDataGrid.php
@@ -43,21 +43,14 @@ class OrderDataGrid extends DataGrid
     public function addColumns()
     {
         $this->addColumn([
-            'index' => 'id',
+            'index' => 'increment_id',
             'label' => trans('admin::app.datagrid.id'),
             'type' => 'number',
             'searchable' => false,
             'sortable' => true,
             'filterable' => true
         ]);
-        $this->addColumn([
-            'index' => 'increment_id',
-            'label' => trans('admin::app.datagrid.order_number'),
-            'type' => 'string',
-            'searchable' => true,
-            'sortable' => true,
-            'filterable' => true
-        ]);
+
         $this->addColumn([
             'index' => 'base_sub_total',
             'label' => trans('admin::app.datagrid.sub-total'),
diff --git a/packages/Webkul/Admin/src/Mail/NewInventorySourceNotification.php b/packages/Webkul/Admin/src/Mail/NewInventorySourceNotification.php
index 8ef0a5f56..4ed66f352 100644
--- a/packages/Webkul/Admin/src/Mail/NewInventorySourceNotification.php
+++ b/packages/Webkul/Admin/src/Mail/NewInventorySourceNotification.php
@@ -46,7 +46,7 @@ class NewInventorySourceNotification extends Mailable
         $inventory = $this->shipment->inventory_source;
 
         return $this->to($inventory->contact_email, $inventory->name)
-                ->subject(trans('shop::app.mail.shipment.subject', ['order_id' => $order->id]))
+                ->subject(trans('shop::app.mail.shipment.subject', ['order_id' => $order->increment_id]))
                 ->view('shop::emails.sales.new-inventorysource-shipment');
     }
 }
diff --git a/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php b/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php
index f74f331b7..a816d0d05 100755
--- a/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php
+++ b/packages/Webkul/Admin/src/Mail/NewInvoiceNotification.php
@@ -46,7 +46,7 @@ class NewInvoiceNotification extends Mailable
 
         return $this->to($order->customer_email, $order->customer_full_name)
                 ->from(env('SHOP_MAIL_FROM'))
-                ->subject(trans('shop::app.mail.invoice.subject', ['order_id' => $order->id]))
+                ->subject(trans('shop::app.mail.invoice.subject', ['order_id' => $order->increment_id]))
                 ->view('shop::emails.sales.new-invoice');
     }
 }
diff --git a/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php b/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php
index ae51be5d8..1a90aa5f9 100755
--- a/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php
+++ b/packages/Webkul/Admin/src/Mail/NewShipmentNotification.php
@@ -46,7 +46,7 @@ class NewShipmentNotification extends Mailable
 
         return $this->to($order->customer_email, $order->customer_full_name)
                 ->from(env('SHOP_MAIL_FROM'))
-                ->subject(trans('shop::app.mail.shipment.subject', ['order_id' => $order->id]))
+                ->subject(trans('shop::app.mail.shipment.subject', ['order_id' => $order->increment_id]))
                 ->view('shop::emails.sales.new-shipment');
     }
 }
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php
index 1a9eb9c87..1b3d98dc9 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/create.blade.php
@@ -43,7 +43,7 @@
                                         </span>
 
                                         <span class="value">
-                                            <a href="{{ route('admin.sales.orders.view', $order->id) }}">#{{ $order->id }}</a>
+                                            <a href="{{ route('admin.sales.orders.view', $order->increment_id) }}">#{{ $order->increment_id }}</a>
                                         </span>
                                     </div>
 
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php
index d02d3b38c..bde2c0e74 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/invoices/view.blade.php
@@ -43,7 +43,7 @@
                                     </span>
 
                                     <span class="value">
-                                        <a href="{{ route('admin.sales.orders.view', $order->id) }}">#{{ $order->id }}</a>
+                                        <a href="{{ route('admin.sales.orders.view', $order->id) }}">#{{ $order->increment_id }}</a>
                                     </span>
                                 </div>
 
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
index a14f756ff..910177260 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/orders/view.blade.php
@@ -1,7 +1,7 @@
 @extends('admin::layouts.master')
 
 @section('page_title')
-    {{ __('admin::app.sales.orders.view-title', ['order_id' => $order->id]) }}
+    {{ __('admin::app.sales.orders.view-title', ['order_id' => $order->increment_id]) }}
 @stop
 
 @section('content-wrapper')
@@ -375,7 +375,7 @@
                                     <tr>
                                         <td>#{{ $invoice->id }}</td>
                                         <td>{{ $invoice->created_at }}</td>
-                                        <td>#{{ $invoice->order->id }}</td>
+                                        <td>#{{ $invoice->order->increment_id }}</td>
                                         <td>{{ $invoice->address->name }}</td>
                                         <td>{{ $invoice->status_label }}</td>
                                         <td>{{ core()->formatBasePrice($invoice->base_grand_total) }}</td>
@@ -419,7 +419,7 @@
                                     <tr>
                                         <td>#{{ $shipment->id }}</td>
                                         <td>{{ $shipment->created_at }}</td>
-                                        <td>#{{ $shipment->order->id }}</td>
+                                        <td>#{{ $shipment->order->increment_id }}</td>
                                         <td>{{ $shipment->order->created_at }}</td>
                                         <td>{{ $shipment->address->name }}</td>
                                         <td>{{ $shipment->total_qty }}</td>
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php
index bdd82af4f..6f4fdc0cd 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/shipments/create.blade.php
@@ -43,7 +43,7 @@
                                         </span>
 
                                         <span class="value">
-                                            <a href="{{ route('admin.sales.orders.view', $order->id) }}">#{{ $order->id }}</a>
+                                            <a href="{{ route('admin.sales.orders.view', $order->id) }}">#{{ $order->increment_id }}</a>
                                         </span>
                                     </div>
 
diff --git a/packages/Webkul/Admin/src/Resources/views/sales/shipments/view.blade.php b/packages/Webkul/Admin/src/Resources/views/sales/shipments/view.blade.php
index 825f8221d..22fb78e3a 100755
--- a/packages/Webkul/Admin/src/Resources/views/sales/shipments/view.blade.php
+++ b/packages/Webkul/Admin/src/Resources/views/sales/shipments/view.blade.php
@@ -34,21 +34,21 @@
 
                             <div class="section-content">
                                 <div class="row">
-                                    <span class="title"> 
+                                    <span class="title">
                                         {{ __('admin::app.sales.shipments.order-id') }}
                                     </span>
 
                                     <span class="value">
-                                        <a href="{{ route('admin.sales.orders.view', $order->id) }}">#{{ $order->id }}</a>
+                                        <a href="{{ route('admin.sales.orders.view', $order->id) }}">#{{ $order->increment_id }}</a>
                                     </span>
                                 </div>
 
                                 <div class="row">
-                                    <span class="title"> 
+                                    <span class="title">
                                         {{ __('admin::app.sales.orders.order-date') }}
                                     </span>
 
-                                    <span class="value"> 
+                                    <span class="value">
                                         {{ $order->created_at }}
                                     </span>
                                 </div>
@@ -57,7 +57,7 @@
                                     <span class="title">
                                         {{ __('admin::app.sales.orders.order-status') }}
                                     </span>
-                                    
+
                                     <span class="value">
                                         {{ $order->status_label }}
                                     </span>
@@ -67,7 +67,7 @@
                                     <span class="title">
                                         {{ __('admin::app.sales.orders.channel') }}
                                     </span>
-                                        
+
                                     <span class="value">
                                         {{ $order->channel_name }}
                                     </span>
@@ -82,21 +82,21 @@
 
                             <div class="section-content">
                                 <div class="row">
-                                    <span class="title"> 
+                                    <span class="title">
                                         {{ __('admin::app.sales.orders.customer-name') }}
                                     </span>
 
-                                    <span class="value"> 
+                                    <span class="value">
                                         {{ $shipment->address->name }}
                                     </span>
                                 </div>
 
                                 <div class="row">
-                                    <span class="title"> 
+                                    <span class="title">
                                         {{ __('admin::app.sales.orders.email') }}
                                     </span>
 
-                                    <span class="value"> 
+                                    <span class="value">
                                         {{ $shipment->address->email }}
                                     </span>
                                 </div>
@@ -117,7 +117,7 @@
                             <div class="section-content">
 
                                 @include ('admin::sales.address', ['address' => $order->billing_address])
-                                
+
                             </div>
                         </div>
 
@@ -128,13 +128,13 @@
                                 </div>
 
                                 <div class="section-content">
-                                
+
                                     @include ('admin::sales.address', ['address' => $order->shipping_address])
 
                                 </div>
                             </div>
                         @endif
-                    
+
                     </div>
                 </accordian>
 
@@ -148,21 +148,21 @@
 
                             <div class="section-content">
                                 <div class="row">
-                                    <span class="title"> 
+                                    <span class="title">
                                         {{ __('admin::app.sales.orders.payment-method') }}
                                     </span>
 
-                                    <span class="value"> 
+                                    <span class="value">
                                         {{ core()->getConfigData('sales.paymentmethods.' . $order->payment->method . '.title') }}
                                     </span>
                                 </div>
 
                                 <div class="row">
-                                    <span class="title"> 
+                                    <span class="title">
                                         {{ __('admin::app.sales.orders.currency') }}
                                     </span>
 
-                                    <span class="value"> 
+                                    <span class="value">
                                         {{ $order->order_currency_code }}
                                     </span>
                                 </div>
@@ -176,53 +176,53 @@
 
                             <div class="section-content">
                                 <div class="row">
-                                    <span class="title"> 
+                                    <span class="title">
                                         {{ __('admin::app.sales.orders.shipping-method') }}
                                     </span>
 
-                                    <span class="value"> 
+                                    <span class="value">
                                         {{ $order->shipping_title }}
                                     </span>
                                 </div>
 
                                 <div class="row">
-                                    <span class="title"> 
+                                    <span class="title">
                                         {{ __('admin::app.sales.orders.shipping-price') }}
                                     </span>
 
-                                    <span class="value"> 
+                                    <span class="value">
                                         {{ core()->formatBasePrice($order->base_shipping_amount) }}
                                     </span>
                                 </div>
 
                                 @if ($shipment->inventory_source)
                                     <div class="row">
-                                        <span class="title"> 
+                                        <span class="title">
                                             {{ __('admin::app.sales.shipments.inventory-source') }}
                                         </span>
 
-                                        <span class="value"> 
+                                        <span class="value">
                                             {{ $shipment->inventory_source->name }}
                                         </span>
                                     </div>
                                 @endif
 
                                 <div class="row">
-                                    <span class="title"> 
+                                    <span class="title">
                                         {{ __('admin::app.sales.shipments.carrier-title') }}
                                     </span>
 
-                                    <span class="value"> 
+                                    <span class="value">
                                         {{ $shipment->carrier_title }}
                                     </span>
                                 </div>
 
                                 <div class="row">
-                                    <span class="title"> 
+                                    <span class="title">
                                         {{ __('admin::app.sales.shipments.tracking-number') }}
                                     </span>
 
-                                    <span class="value"> 
+                                    <span class="value">
                                         {{ $shipment->track_number }}
                                     </span>
                                 </div>
diff --git a/packages/Webkul/Shop/src/Resources/lang/en/app.php b/packages/Webkul/Shop/src/Resources/lang/en/app.php
index 739f89a5d..d496a6826 100755
--- a/packages/Webkul/Shop/src/Resources/lang/en/app.php
+++ b/packages/Webkul/Shop/src/Resources/lang/en/app.php
@@ -238,7 +238,8 @@ return [
                     'order_id' => 'Order ID',
                     'date' => 'Date',
                     'status' => 'Status',
-                    'total' => 'Total'
+                    'total' => 'Total',
+                    'order_number' => 'Order Number'
                 ],
 
                 'view' => [
diff --git a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
index 8fd17453b..afe5dba27 100755
--- a/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/customers/account/orders/view.blade.php
@@ -1,7 +1,7 @@
 @extends('shop::layouts.master')
 
 @section('page_title')
-    {{ __('shop::app.customer.account.order.view.page-tile', ['order_id' => $order->id]) }}
+    {{ __('shop::app.customer.account.order.view.page-tile', ['order_id' => $order->increment_id]) }}
 @endsection
 
 @section('content-wrapper')
@@ -14,7 +14,7 @@
             <div class="account-head">
                 <span class="back-icon"><a href="{{ route('customer.account.index') }}"><i class="icon icon-menu-back"></i></a></span>
                 <span class="account-heading">
-                    {{ __('shop::app.customer.account.order.view.page-tile', ['order_id' => $order->id]) }}
+                    {{ __('shop::app.customer.account.order.view.page-tile', ['order_id' => $order->increment_id]) }}
                 </span>
                 <span></span>
             </div>
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php
index 778954ade..1971e89f9 100644
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-admin-order.blade.php
@@ -17,7 +17,7 @@
 
             <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
                 {!! __('shop::app.mail.order.greeting-admin', [
-                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->id . '</a>',
+                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
                     'created_at' => $order->created_at
                     ])
                 !!}
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-inventorysource-shipment.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-inventorysource-shipment.blade.php
index 4007ab277..42b326f9a 100644
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-inventorysource-shipment.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-inventorysource-shipment.blade.php
@@ -11,7 +11,7 @@
     <div style="padding: 30px;">
         <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
             <span style="font-weight: bold;">
-                {{ __('shop::app.mail.shipment.inventory-heading', ['order_id' => $order->id, 'shipment_id' => $shipment->id]) }}
+                {{ __('shop::app.mail.shipment.inventory-heading', ['order_id' => $order->increment_id, 'shipment_id' => $shipment->id]) }}
             </span> <br>
 
             <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
@@ -20,7 +20,7 @@
 
             <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
                 {!! __('shop::app.mail.shipment.greeting', [
-                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->id . '</a>',
+                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
                     'created_at' => $order->created_at
                     ])
                 !!}
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php
index f259f68de..478cb6abe 100755
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-invoice.blade.php
@@ -10,7 +10,7 @@
     <div style="padding: 30px;">
         <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
             <span style="font-weight: bold;">
-                {{ __('shop::app.mail.invoice.heading', ['order_id' => $order->id, 'invoice_id' => $invoice->id]) }}
+                {{ __('shop::app.mail.invoice.heading', ['order_id' => $order->increment_id, 'invoice_id' => $invoice->id]) }}
             </span> <br>
 
             <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
@@ -19,7 +19,7 @@
 
             <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
                 {!! __('shop::app.mail.order.greeting', [
-                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->id . '</a>',
+                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
                     'created_at' => $order->created_at
                     ])
                 !!}
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php
index 5a7c13011..2c4a72a4e 100755
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-order.blade.php
@@ -17,7 +17,7 @@
 
             <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
                 {!! __('shop::app.mail.order.greeting', [
-                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->id . '</a>',
+                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
                     'created_at' => $order->created_at
                     ])
                 !!}
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
index 2aa41d4a5..9ec9f61ae 100755
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/new-shipment.blade.php
@@ -10,7 +10,7 @@
     <div style="padding: 30px;">
         <div style="font-size: 20px;color: #242424;line-height: 30px;margin-bottom: 34px;">
             <span style="font-weight: bold;">
-                {{ __('shop::app.mail.shipment.heading', ['order_id' => $order->id, 'shipment_id' => $shipment->id]) }}
+                {{ __('shop::app.mail.shipment.heading', ['order_id' => $order->increment_id, 'shipment_id' => $shipment->id]) }}
             </span> <br>
 
             <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
@@ -19,7 +19,7 @@
 
             <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
                 {!! __('shop::app.mail.order.greeting', [
-                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->id . '</a>',
+                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
                     'created_at' => $order->created_at
                     ])
                 !!}
diff --git a/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel.blade.php b/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel.blade.php
index 2e4aa2251..ecc4d55fd 100644
--- a/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel.blade.php
+++ b/packages/Webkul/Shop/src/Resources/views/emails/sales/order-cancel.blade.php
@@ -17,7 +17,7 @@
 
             <p style="font-size: 16px;color: #5E5E5E;line-height: 24px;">
                 {!! __('shop::app.mail.order.cancel.greeting', [
-                    'order_id' => '<a href="' . route('customer.orders.view', $order->id) . '" style="color: #0041FF; font-weight: bold;">#' . $order->id . '</a>',
+                    'order_id' => '<a href="' . route('customer.orders.view', $) . '" style="color: #0041FF; font-weight: bold;">#' . $order->increment_id . '</a>',
                     'created_at' => $order->created_at
                     ])
                 !!}