diff --git a/style/components/datepicker/Picker.less b/style/components/datepicker/Picker.less
index bc84160037..1e9f39b0e9 100644
--- a/style/components/datepicker/Picker.less
+++ b/style/components/datepicker/Picker.less
@@ -10,6 +10,7 @@
 .@{prefixCalendarClass}-picker {
   position: relative;
   display: inline-block;
+
   &-input {
     .input;
   }
@@ -20,10 +21,10 @@
     .transition(all .3s @ease-in-out);
     width: 14px;
     height: 14px;
-    right: 16px;
+    line-height: 14px;
+    right: 8px;
     color: #999;
     top: 50%;
-    line-height: 1;
     margin-top: -7px;
     &:after {
       content: "\e60c";
@@ -40,4 +41,7 @@
     border-color: #23c0fa;
     box-shadow: 0 0 3px #23c0fa;
   }
+  .ant-form-item &-input {
+    height: 32px;
+  }
 }
diff --git a/style/mixins/input.less b/style/mixins/input.less
index 04f47d669a..aee2cfd0e0 100644
--- a/style/mixins/input.less
+++ b/style/mixins/input.less
@@ -16,7 +16,6 @@
   position: relative;
   display: inline-block;
   padding: @input-padding-vertical-base @input-padding-horizontal;
-  margin-right: 8px;
   width: 100%;
   cursor: text;
   height: @input-height-base;