diff --git a/packages/Webkul/BookingProduct/publishable/assets/css/velocity-booking.css b/packages/Webkul/BookingProduct/publishable/assets/css/velocity-booking.css
index de40fbfab..3624dce6d 100644
--- a/packages/Webkul/BookingProduct/publishable/assets/css/velocity-booking.css
+++ b/packages/Webkul/BookingProduct/publishable/assets/css/velocity-booking.css
@@ -1 +1 @@
-.bp-location-icon{background-image:url(../images/location.svg);width:32px;height:32px}.bp-slot-icon{background-image:url(../images/slot.svg);width:32px;height:32px}.bp-phone-icon{background-image:url(../images/phone.svg);width:32px;height:32px}.booking-information{margin-bottom:15px}.booking-information .booking-info-row{padding-left:32px;margin-bottom:20px;position:relative}.booking-information .booking-info-row .icon{position:absolute;left:0;top:-4px}.booking-information .booking-info-row .title{color:#5e5e5e;display:block;margin-bottom:5px}.booking-information .booking-info-row .value{display:block;margin-bottom:5px}.booking-information .booking-info-row .value .text-danger{color:#ff5656}.booking-information .booking-info-row .toggle{color:#0041ff;cursor:pointer;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.booking-information .booking-info-row .toggle .icon{position:relative;width:10px;height:10px;margin-left:5px;top:0}.booking-information .booking-info-row .toggle .icon.arrow-down-icon{background-image:url(../images/arrow-down.svg)!important}.booking-information .booking-info-row .toggle .icon.arrow-up-icon{background-image:url(../images/arrow-up.svg)!important}.booking-information .booking-info-row .days-availability table{margin-top:10px;border-collapse:collapse}.booking-information .booking-info-row .days-availability table tr td{padding:5px;vertical-align:top}.booking-information .booking-info-row .days-availability table tr td:first-child{padding-left:0}.booking-information .booking-info-row .days-availability table tr td:last-child{font-size:14px;padding-left:15px;padding-right:0;color:#5e5e5e}.booking-information .booking-info-row .days-availability table tr td .text-danger{color:#ff5656}.booking-information .book-slots{display:inline-block;width:100%}.booking-information .book-slots h3{font-weight:600;font-size:16px;color:#242424;margin-top:0}.booking-information .book-slots label{color:#3a3a3a}.booking-information .book-slots .control-group label,.booking-information .book-slots .form-group label{font-size:16px}.booking-information .book-slots .control-group .radio,.booking-information .book-slots .form-group .radio{display:inline-block}.booking-information .book-slots .control-group-container{width:100%;float:left}.booking-information .book-slots .control-group-container .control-group:not(.quantity),.booking-information .book-slots .control-group-container .form-group:not(.quantity){width:50%;float:left}.booking-information .book-slots .control-group-container .control-group:not(.quantity) .control,.booking-information .book-slots .control-group-container .control-group:not(.quantity) .form-style,.booking-information .book-slots .control-group-container .form-group:not(.quantity) .control,.booking-information .book-slots .control-group-container .form-group:not(.quantity) .form-style{width:100%}.booking-information .book-slots .control-group-container .control-group:not(.quantity).date,.booking-information .book-slots .control-group-container .form-group:not(.quantity).date{padding-right:5px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).date:after,.booking-information .book-slots .control-group-container .form-group:not(.quantity).date:after{position:absolute;top:14px;right:10px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).slots:first-child,.booking-information .book-slots .control-group-container .form-group:not(.quantity).slots:first-child{padding-right:5px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).slots:last-child,.booking-information .book-slots .control-group-container .form-group:not(.quantity).slots:last-child{padding-left:5px}.booking-information .book-slots .ticket-list .ticket-item{width:100%;display:inline-block;padding:16px 0;border-bottom:1px solid #e8e8e8}.booking-information .book-slots .ticket-list .ticket-item:last-child{border-bottom:0}.booking-information .book-slots .ticket-list .ticket-item .ticket-info{width:50%;float:left}.booking-information .book-slots .ticket-list .ticket-item .ticket-info .ticket-name{color:#242424;margin-bottom:12px}.booking-information .book-slots .ticket-list .ticket-item .ticket-info .ticket-price{color:#5e5e5e}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity{width:50%;display:inline-block;text-align:right}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .control-group,.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .form-group{margin:0}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .control-group.quantity,.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .form-group.quantity{max-width:none;width:auto;text-align:center;margin-bottom:0;border-top:0;padding-top:0}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .control-group.quantity label,.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .form-group.quantity label{display:none}.booking-information .book-slots .ticket-list .ticket-item p{color:#242424;margin-bottom:0;font-weight:400}.booking-information .book-slots .ticket-total{font-size:16px;font-weight:600;color:#242424;padding-top:16px}.booking-information .book-slots .ticket-total>div{margin-bottom:12px}.booking-information .book-slots .ticket-total>div:last-child{margin-bottom:0}.booking-information .book-slots .ticket-total>div p{color:#242424;font-weight:400;margin-top:4px}
\ No newline at end of file
+.bp-location-icon{background-image:url(../images/location.svg);width:32px;height:32px}.bp-slot-icon{background-image:url(../images/slot.svg);width:32px;height:32px}.bp-phone-icon{background-image:url(../images/phone.svg);width:32px;height:32px}.booking-information{margin-bottom:15px}.booking-information .booking-info-row{padding-left:32px;margin-bottom:20px;position:relative}.booking-information .booking-info-row .icon{position:absolute;left:0;top:-4px}.booking-information .booking-info-row .title{color:#5e5e5e;display:block;margin-bottom:5px}.booking-information .booking-info-row .value{display:block;margin-bottom:5px}.booking-information .booking-info-row .value .text-danger{color:#ff5656}.booking-information .booking-info-row .toggle{color:#0041ff;cursor:pointer;-webkit-touch-callout:none;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.booking-information .booking-info-row .toggle .icon{position:relative;display:inline-block;width:8px;height:8px;margin-left:5px;top:-1px}.booking-information .booking-info-row .toggle .icon.arrow-down-icon{background-image:url(../images/arrow-down.svg)!important}.booking-information .booking-info-row .toggle .icon.arrow-up-icon{background-image:url(../images/arrow-up.svg)!important}.booking-information .booking-info-row .days-availability table{margin-top:10px;border-collapse:collapse}.booking-information .booking-info-row .days-availability table tr td{padding:5px;vertical-align:top}.booking-information .booking-info-row .days-availability table tr td:first-child{padding-left:0}.booking-information .booking-info-row .days-availability table tr td:last-child{font-size:14px;padding-left:15px;padding-right:0;color:#5e5e5e}.booking-information .booking-info-row .days-availability table tr td .text-danger{color:#ff5656}.booking-information .book-slots{display:inline-block;width:100%}.booking-information .book-slots h3{font-weight:600;font-size:16px;color:#242424;margin-top:0}.booking-information .book-slots label{color:#3a3a3a}.booking-information .book-slots .control-group label,.booking-information .book-slots .form-group label{font-size:16px}.booking-information .book-slots .control-group .radio,.booking-information .book-slots .form-group .radio{display:inline-block}.booking-information .book-slots .control-group-container{width:100%;float:left}.booking-information .book-slots .control-group-container .control-group:not(.quantity),.booking-information .book-slots .control-group-container .form-group:not(.quantity){width:50%;float:left}.booking-information .book-slots .control-group-container .control-group:not(.quantity) .control,.booking-information .book-slots .control-group-container .control-group:not(.quantity) .form-style,.booking-information .book-slots .control-group-container .form-group:not(.quantity) .control,.booking-information .book-slots .control-group-container .form-group:not(.quantity) .form-style{width:100%}.booking-information .book-slots .control-group-container .control-group:not(.quantity).date,.booking-information .book-slots .control-group-container .form-group:not(.quantity).date{padding-right:5px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).date:after,.booking-information .book-slots .control-group-container .form-group:not(.quantity).date:after{position:absolute;top:14px;right:10px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).slots:first-child,.booking-information .book-slots .control-group-container .form-group:not(.quantity).slots:first-child{padding-right:5px}.booking-information .book-slots .control-group-container .control-group:not(.quantity).slots:last-child,.booking-information .book-slots .control-group-container .form-group:not(.quantity).slots:last-child{padding-left:5px}.booking-information .book-slots .ticket-list .ticket-item{width:100%;display:inline-block;padding:16px 0;border-bottom:1px solid #e8e8e8}.booking-information .book-slots .ticket-list .ticket-item:last-child{border-bottom:0}.booking-information .book-slots .ticket-list .ticket-item .ticket-info{width:50%;float:left}.booking-information .book-slots .ticket-list .ticket-item .ticket-info .ticket-name{color:#242424;margin-bottom:12px}.booking-information .book-slots .ticket-list .ticket-item .ticket-info .ticket-price{color:#5e5e5e}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity{width:50%;display:inline-block;text-align:right}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .control-group,.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .form-group{margin:0}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .control-group.quantity,.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .form-group.quantity{max-width:none;width:auto;text-align:center;margin-bottom:0;border-top:0;padding-top:0}.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .control-group.quantity label,.booking-information .book-slots .ticket-list .ticket-item .ticket-quantity .form-group.quantity label{display:none}.booking-information .book-slots .ticket-list .ticket-item p{color:#242424;margin-bottom:0;font-weight:400}.booking-information .book-slots .ticket-total{font-size:16px;font-weight:600;color:#242424;padding-top:16px}.booking-information .book-slots .ticket-total>div{margin-bottom:12px}.booking-information .book-slots .ticket-total>div:last-child{margin-bottom:0}.booking-information .book-slots .ticket-total>div p{color:#242424;font-weight:400;margin-top:4px}.form-group{position:relative}.form-group.date:after,.form-group.datetime:after{background-image:url(../images/Icon-Calendar.svg);width:24px;height:24px;content:"";display:inline-block;vertical-align:middle;margin-left:-34px;margin-top:2px;top:3px!important;pointer-events:none}
\ No newline at end of file
diff --git a/packages/Webkul/BookingProduct/publishable/assets/images/Icon-Calendar.svg b/packages/Webkul/BookingProduct/publishable/assets/images/Icon-Calendar.svg
new file mode 100755
index 000000000..1d5ab01f3
--- /dev/null
+++ b/packages/Webkul/BookingProduct/publishable/assets/images/Icon-Calendar.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 50 (54983) - http://www.bohemiancoding.com/sketch -->
+    <title>Icon-Calendar</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Icon-Calendar" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g transform="translate(3.000000, 2.000000)">
+            <path d="M2,9 L4,9 L4,11 L2,11 L2,9 Z M5,9 L7,9 L7,11 L5,11 L5,9 Z M8,9 L10,9 L10,11 L8,11 L8,9 Z M11,9 L13,9 L13,11 L11,11 L11,9 Z M14,9 L16,9 L16,11 L14,11 L14,9 Z M2,12 L4,12 L4,14 L2,14 L2,12 Z M5,12 L7,12 L7,14 L5,14 L5,12 Z M8,12 L10,12 L10,14 L8,14 L8,12 Z M11,12 L13,12 L13,14 L11,14 L11,12 Z M14,12 L16,12 L16,14 L14,14 L14,12 Z M11,15 L13,15 L13,17 L11,17 L11,15 Z M2,15 L4,15 L4,17 L2,17 L2,15 Z M5,15 L7,15 L7,17 L5,17 L5,15 Z M8,15 L10,15 L10,17 L8,17 L8,15 Z" id="Combined-Shape" fill="#8E8E8E"></path>
+            <rect id="Rectangle-6" stroke="#8E8E8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x="0" y="2" width="18" height="18" rx="2"></rect>
+            <path d="M0,7 L17.2233522,7" id="Path-2" stroke="#8E8E8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
+            <path d="M5.05517578,0.0166015625 L5.05517578,2" id="Path-3" stroke="#8E8E8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
+            <path d="M13,0 L13,1.91914536" id="Path-3-Copy" stroke="#8E8E8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/packages/Webkul/BookingProduct/publishable/assets/mix-manifest.json b/packages/Webkul/BookingProduct/publishable/assets/mix-manifest.json
index 866358cdf..3971ecd45 100644
--- a/packages/Webkul/BookingProduct/publishable/assets/mix-manifest.json
+++ b/packages/Webkul/BookingProduct/publishable/assets/mix-manifest.json
@@ -1,4 +1,4 @@
 {
     "/css/default-booking.css": "/css/default-booking.css?id=3607d6ec4cb93857b42c",
-    "/css/velocity-booking.css": "/css/velocity-booking.css?id=64d628792a52ad6151b7"
+    "/css/velocity-booking.css": "/css/velocity-booking.css?id=fb0d5b9e37ed77d662d1"
 }
diff --git a/packages/Webkul/BookingProduct/src/Resources/assets/images/Icon-Calendar.svg b/packages/Webkul/BookingProduct/src/Resources/assets/images/Icon-Calendar.svg
new file mode 100755
index 000000000..1d5ab01f3
--- /dev/null
+++ b/packages/Webkul/BookingProduct/src/Resources/assets/images/Icon-Calendar.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 50 (54983) - http://www.bohemiancoding.com/sketch -->
+    <title>Icon-Calendar</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Icon-Calendar" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g transform="translate(3.000000, 2.000000)">
+            <path d="M2,9 L4,9 L4,11 L2,11 L2,9 Z M5,9 L7,9 L7,11 L5,11 L5,9 Z M8,9 L10,9 L10,11 L8,11 L8,9 Z M11,9 L13,9 L13,11 L11,11 L11,9 Z M14,9 L16,9 L16,11 L14,11 L14,9 Z M2,12 L4,12 L4,14 L2,14 L2,12 Z M5,12 L7,12 L7,14 L5,14 L5,12 Z M8,12 L10,12 L10,14 L8,14 L8,12 Z M11,12 L13,12 L13,14 L11,14 L11,12 Z M14,12 L16,12 L16,14 L14,14 L14,12 Z M11,15 L13,15 L13,17 L11,17 L11,15 Z M2,15 L4,15 L4,17 L2,17 L2,15 Z M5,15 L7,15 L7,17 L5,17 L5,15 Z M8,15 L10,15 L10,17 L8,17 L8,15 Z" id="Combined-Shape" fill="#8E8E8E"></path>
+            <rect id="Rectangle-6" stroke="#8E8E8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" x="0" y="2" width="18" height="18" rx="2"></rect>
+            <path d="M0,7 L17.2233522,7" id="Path-2" stroke="#8E8E8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
+            <path d="M5.05517578,0.0166015625 L5.05517578,2" id="Path-3" stroke="#8E8E8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
+            <path d="M13,0 L13,1.91914536" id="Path-3-Copy" stroke="#8E8E8E" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file
diff --git a/packages/Webkul/BookingProduct/src/Resources/assets/sass/velocity.scss b/packages/Webkul/BookingProduct/src/Resources/assets/sass/velocity.scss
index 28be20667..17637393b 100644
--- a/packages/Webkul/BookingProduct/src/Resources/assets/sass/velocity.scss
+++ b/packages/Webkul/BookingProduct/src/Resources/assets/sass/velocity.scss
@@ -41,10 +41,11 @@
 
             .icon {
                 position: relative;
-                width: 10px;
-                height: 10px;
+                display: inline-block;
+                width: 8px;
+                height: 8px;
                 margin-left: 5px;
-                top: 0;
+                top: -1px;
 
                 &.arrow-down-icon {
                     background-image: url(../images/arrow-down.svg) !important;
@@ -223,4 +224,23 @@
             }
         }
     }
+}
+
+.form-group {
+    position: relative;
+
+    &.date, &.datetime {
+        &::after {
+            background-image: url("../images/Icon-Calendar.svg");
+            width: 24px;
+            height: 24px;
+            content: '';
+            display: inline-block;
+            vertical-align: middle;
+            margin-left: -34px;
+            margin-top: 2px;
+            top: 3px !important;
+            pointer-events: none;
+        }
+    }
 }
\ No newline at end of file
diff --git a/packages/Webkul/BookingProduct/src/Resources/lang/en/app.php b/packages/Webkul/BookingProduct/src/Resources/lang/en/app.php
index aed75c8a6..34d2f8641 100644
--- a/packages/Webkul/BookingProduct/src/Resources/lang/en/app.php
+++ b/packages/Webkul/BookingProduct/src/Resources/lang/en/app.php
@@ -73,6 +73,7 @@ return [
             'slot-duration' => 'Slot Duration',
             'slot-duration-in-minutes' => ':minutes Minutes',
             'today-availability' => 'Today Availability',
+            'slots-for-all-days' => 'Show for all days',
             'sunday' => 'Sunday',
             'monday' => 'Monday',
             'tuesday' => 'Tuesday',
diff --git a/packages/Webkul/BookingProduct/src/Resources/views/shop/default/products/view/booking/appointment.blade.php b/packages/Webkul/BookingProduct/src/Resources/views/shop/default/products/view/booking/appointment.blade.php
index b67be37ad..ed31c4cab 100644
--- a/packages/Webkul/BookingProduct/src/Resources/views/shop/default/products/view/booking/appointment.blade.php
+++ b/packages/Webkul/BookingProduct/src/Resources/views/shop/default/products/view/booking/appointment.blade.php
@@ -22,9 +22,9 @@
     </span>
 
     <div class="toggle" @click="showDaysAvailability = ! showDaysAvailability">
-        Show for all days
+        {{ __('bookingproduct::app.shop.products.slots-for-all-days') }}
 
-        <i class="icon arrow-down-icon"></i>
+        <i class="icon" :class="[! showDaysAvailability ? 'arrow-down-icon' : 'arrow-up-icon']"></i>
     </div>
 
     <div class="days-availability" v-show="showDaysAvailability">
diff --git a/packages/Webkul/BookingProduct/src/Resources/views/shop/default/products/view/booking/table.blade.php b/packages/Webkul/BookingProduct/src/Resources/views/shop/default/products/view/booking/table.blade.php
index 78300bd6f..1c517879a 100644
--- a/packages/Webkul/BookingProduct/src/Resources/views/shop/default/products/view/booking/table.blade.php
+++ b/packages/Webkul/BookingProduct/src/Resources/views/shop/default/products/view/booking/table.blade.php
@@ -22,9 +22,9 @@
     </span>
 
     <div class="toggle" @click="showDaysAvailability = ! showDaysAvailability">
-        Show for all days
+        {{ __('bookingproduct::app.shop.products.slots-for-all-days') }}
 
-        <i class="icon arrow-down-icon"></i>
+        <i class="icon" :class="[! showDaysAvailability ? 'arrow-down-icon' : 'arrow-up-icon']"></i>
     </div>
 
     <div class="days-availability" v-show="showDaysAvailability">
diff --git a/packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/appointment.blade.php b/packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/appointment.blade.php
index b67be37ad..ed31c4cab 100644
--- a/packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/appointment.blade.php
+++ b/packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/appointment.blade.php
@@ -22,9 +22,9 @@
     </span>
 
     <div class="toggle" @click="showDaysAvailability = ! showDaysAvailability">
-        Show for all days
+        {{ __('bookingproduct::app.shop.products.slots-for-all-days') }}
 
-        <i class="icon arrow-down-icon"></i>
+        <i class="icon" :class="[! showDaysAvailability ? 'arrow-down-icon' : 'arrow-up-icon']"></i>
     </div>
 
     <div class="days-availability" v-show="showDaysAvailability">
diff --git a/packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/table.blade.php b/packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/table.blade.php
index 32b5da8fc..b0feb13d5 100644
--- a/packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/table.blade.php
+++ b/packages/Webkul/BookingProduct/src/Resources/views/shop/velocity/products/view/booking/table.blade.php
@@ -22,9 +22,9 @@
     </span>
 
     <div class="toggle" @click="showDaysAvailability = ! showDaysAvailability">
-        Show for all days
+        {{ __('bookingproduct::app.shop.products.slots-for-all-days') }}
 
-        <i class="icon arrow-down-icon"></i>
+        <i class="icon" :class="[! showDaysAvailability ? 'arrow-down-icon' : 'arrow-up-icon']"></i>
     </div>
 
     <div class="days-availability" v-show="showDaysAvailability">