diff --git a/resources/views/partials/forms/edit/datepicker.blade.php b/resources/views/partials/forms/edit/datepicker.blade.php
index d91659134e..74ec021e4b 100644
--- a/resources/views/partials/forms/edit/datepicker.blade.php
+++ b/resources/views/partials/forms/edit/datepicker.blade.php
@@ -2,11 +2,21 @@
 <div class="form-group{{ $errors->has($fieldname) ? ' has-error' : '' }}">
     <label for="{{ $fieldname }}" class="col-md-3 control-label">{{ $translated_name }}</label>
     <div class="input-group col-md-4">
-        <div class="input-group date" data-provide="datepicker" data-date-clear-btn="true" data-date-format="yyyy-mm-dd"  data-autoclose="true">
-            <input type="text" class="form-control" placeholder="{{ trans('general.select_date') }}" name="{{ $fieldname }}" id="{{ $fieldname }}" value="{{ old($fieldname, ($item->{$fieldname}) ? date('Y-m-d', strtotime($item->{$fieldname})) : '') }}" readonly style="background-color:inherit" maxlength="10">
-            <span class="input-group-addon"><x-icon type="calendar" /></span>
-        </div>
+        <x-input.datepicker
+                name="{{ $fieldname }}"
+                value="{{ old($fieldname, ($item->{$fieldname}) ? date('Y-m-d', strtotime($item->{$fieldname})) : '') }}"
+                placeholder="{{ trans('general.select_date') }}"
+                required="{{ Helper::checkIfRequired($item, 'start_date') }}"
+        />
         {!! $errors->first($fieldname, '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
+    @if  (isset($help_text))
+        <div class="col-md-8 col-md-offset-3">
+            <p class="help-block">
+                {!!  $help_text !!}
+            </p>
+        </div>
+    @endif
 </div>
 
+<!-- /Datepicker -->
\ No newline at end of file