diff --git a/src/VirtoCommerce.PricingModule.Web/Scripts/blades/item/item-prices.tpl.html b/src/VirtoCommerce.PricingModule.Web/Scripts/blades/item/item-prices.tpl.html
index 4269fb4b..40d30c58 100644
--- a/src/VirtoCommerce.PricingModule.Web/Scripts/blades/item/item-prices.tpl.html
+++ b/src/VirtoCommerce.PricingModule.Web/Scripts/blades/item/item-prices.tpl.html
@@ -68,14 +68,17 @@
 <script type="text/ng-template" id="ui-grid/dateCellTemplate">
   <div class="ui-grid-cell-contents" title="{{grid.validate.getTitleFormattedErrors(row.entity,col.colDef)}}">
     <div class="form-editor form-input">
-      <input class="ng-valid form-input" value="{{MODEL_COL_FIELD | date: 'short' }}" ng-class="{'ng-invalid' : grid.validate.isInvalid(row.entity,col.colDef)}" readonly="readonly" placeholder="N/A" />
+      <input class="ng-valid form-input" value="{{MODEL_COL_FIELD | date: 'medium' }}" ng-class="{'ng-invalid' : grid.validate.isInvalid(row.entity,col.colDef)}" readonly="readonly" placeholder="N/A" />
     </div>
   </div>
 </script>
 <!-- Date Cell Write -->
 <script type="text/ng-template" id="date-cellTextEditor">
   <div class="form-editor form-input __calendar">
-    <input type="text" class="form-input" date ng-model="MODEL_COL_FIELD" datepicker-popup="short" datepicker-popup-dropless="true" is-open="grid.appScope.datepickers[col.colDef.name]">
+    <input type="text" class="form-input" date ng-model="MODEL_COL_FIELD" datepicker-popup is-open="grid.appScope.datepickers[col.colDef.name]">
+    <button class="btn" type="button" ng-click="grid.appScope.open($event, col.colDef.name)">
+      <i class="btn-ico fa fa-calendar"></i>
+    </button>
   </div>
 </script>
 
diff --git a/src/VirtoCommerce.PricingModule.Web/Scripts/blades/prices-list.tpl.html b/src/VirtoCommerce.PricingModule.Web/Scripts/blades/prices-list.tpl.html
index 9779490e..83ff0d8f 100644
--- a/src/VirtoCommerce.PricingModule.Web/Scripts/blades/prices-list.tpl.html
+++ b/src/VirtoCommerce.PricingModule.Web/Scripts/blades/prices-list.tpl.html
@@ -44,7 +44,7 @@
 <script type="text/ng-template" id="ui-grid/dateCellTemplate">
   <div class="ui-grid-cell-contents" title="{{grid.validate.getTitleFormattedErrors(row.entity,col.colDef)}}">
     <div class="form-editor form-input">
-      <input class="ng-valid form-input" value="{{MODEL_COL_FIELD | date: 'short' }}" ng-class="{'ng-invalid' : grid.validate.isInvalid(row.entity,col.colDef)}" readonly="readonly" placeholder="N/A" />
+      <input class="ng-valid form-input" value="{{MODEL_COL_FIELD | date: 'medium' }}" ng-class="{'ng-invalid' : grid.validate.isInvalid(row.entity,col.colDef)}" readonly="readonly" placeholder="N/A" />
     </div>
   </div>
 </script>
@@ -71,7 +71,10 @@
 </script>
 <script type="text/ng-template" id="date-cellTextEditor">
   <div class="form-editor form-input __calendar">
-    <input type="text" class="form-input" date ng-model="MODEL_COL_FIELD" datepicker-popup="short" datepicker-popup-dropless="true" is-open="grid.appScope.datepickers[col.colDef.name]">
+    <input type="text" class="form-input" date ng-model="MODEL_COL_FIELD" datepicker-popup is-open="grid.appScope.datepickers[col.colDef.name]">
+    <button class="btn" type="button" ng-click="grid.appScope.open($event, col.colDef.name)">
+      <i class="btn-ico fa fa-calendar"></i>
+    </button>
   </div>
 </script>
 <script type="text/ng-template" id="list.row.html">