diff --git a/src/components/Button/style.scss b/src/components/Button/style.scss
index b75063cf..c8e7eb07 100644
--- a/src/components/Button/style.scss
+++ b/src/components/Button/style.scss
@@ -146,3 +146,39 @@
   box-shadow: none;
 }
 
+.btn-default[disabled]:hover,
+.btn-default.disabled:hover,
+.btn-default[disabled]:active,
+.btn-default.disabled:active{
+ background-color: $white;
+ border-color: $border-2;
+ color: $text-2;
+ box-shadow: none;
+}
+
+.btn-success[disabled]:hover,
+.btn-success.disabled:hover,
+.btn-success[disabled]:active,
+.btn-success.disabled:active{
+  background-color: $success-normal;
+ box-shadow: none;
+}
+
+.btn-warning[disabled]:hover,
+.btn-warning.disabled:hover,
+.btn-warning[disabled]:active,
+.btn-warning.disabled:active{
+  background-color: $warning-normal;
+ box-shadow: none;
+}
+
+.btn-link.disabled,
+.btn-link[disabled],
+.btn-link[disabled]:hover,
+.btn-link.disabled:hover,
+.btn-link[disabled]:active,
+.btn-link.disabled:active{
+  color: $primary-normal;
+  text-decoration: none;
+}
+
diff --git a/src/components/DatePicker/style.scss b/src/components/DatePicker/style.scss
index e12d1a64..f7ed31a9 100644
--- a/src/components/DatePicker/style.scss
+++ b/src/components/DatePicker/style.scss
@@ -24,6 +24,6 @@
     }
   }
   .rc-calendar{
-    top: 34px;
+    top: 32px;
   }
 }
\ No newline at end of file
diff --git a/src/components/Popover/index.tsx b/src/components/Popover/index.tsx
index 0c754e30..5084750b 100644
--- a/src/components/Popover/index.tsx
+++ b/src/components/Popover/index.tsx
@@ -69,6 +69,16 @@ const Popover: React.FC<PopoverProps> = props => {
         target={wrapper.current || null}
         show={show}
         onHide={handleHide}
+        popperConfig={{
+          modifiers:[
+            {
+              name: 'offset',
+              options: {
+                offset: [0, 11],
+              },
+            },
+          ]
+        }}
       >
         <BasePopover
           id="popover"
diff --git a/src/components/RangePicker/style.scss b/src/components/RangePicker/style.scss
index 5740db7c..d50caab6 100644
--- a/src/components/RangePicker/style.scss
+++ b/src/components/RangePicker/style.scss
@@ -37,7 +37,7 @@
 .rc-calendar {
   border-color: $border-2;
   box-shadow: $shadow-timePicker;
-  top: 44px;
+  top: 43px;
 }
 
 .rc-calendar-year-panel-selected-cell .rc-calendar-year-panel-year,
diff --git a/src/components/TimePicker/style.scss b/src/components/TimePicker/style.scss
index f31a1e93..7643697b 100644
--- a/src/components/TimePicker/style.scss
+++ b/src/components/TimePicker/style.scss
@@ -27,5 +27,5 @@
 }
 
 .rc-time-picker-panel-inner{
-  top: 42px;
+  top: 41px;
 }
\ No newline at end of file