diff --git a/components/button/index.en-US.md b/components/button/index.en-US.md
index 098455aa95..66638f99af 100644
--- a/components/button/index.en-US.md
+++ b/components/button/index.en-US.md
@@ -38,7 +38,7 @@ It accepts all props which native buttons support.
 
 Following the Ant Design specification, we will add one space between if Button contains two Chinese characters only. If you don't need that, you can use [ConfigProvider](/components/config-provider/#API) to set `autoInsertSpaceInButton` as `false`.
 
-![Button with two Chinese characters](https://gw.alipayobjects.com/zos/antfincdn/Hz5HL9gsT4/f29f170d-b78d-4d2b-aa71-0da6a9ead4d9.png)
+<img src="http://alipay-rmsdeploy-image.cn-hangzhou.alipay.aliyun-inc.com/antfincdn/NstpRYFrCr/f29f170d-b78d-4d2b-aa71-0da6a9ead4d9.png" style="box-shadow: none" alt="Button with two Chinese characters" />
 
 <style>
 [id^=components-button-demo-] .ant-btn {
diff --git a/components/button/index.zh-CN.md b/components/button/index.zh-CN.md
index ce5dc319b9..a2c5ad23d5 100644
--- a/components/button/index.zh-CN.md
+++ b/components/button/index.zh-CN.md
@@ -41,7 +41,7 @@ subtitle: 按钮
 
 根据 Ant Design 设计规范要求，我们会在按钮内只有两个汉字时自动添加空格，如果你不需要这个特性，可以设置 [ConfigProvider](/components/config-provider/#API) 的 `autoInsertSpaceInButton` 为 `false`。
 
-![](https://gw.alipayobjects.com/zos/antfincdn/Hz5HL9gsT4/f29f170d-b78d-4d2b-aa71-0da6a9ead4d9.png)
+<img src="http://alipay-rmsdeploy-image.cn-hangzhou.alipay.aliyun-inc.com/antfincdn/NstpRYFrCr/f29f170d-b78d-4d2b-aa71-0da6a9ead4d9.png" style="box-shadow: none" alt="移除两个汉字之间的空格" />
 
 <style>
 [id^="components-button-demo-"] .ant-btn {
diff --git a/components/button/style/mixin.less b/components/button/style/mixin.less
index dedb1913f6..cd38bd290e 100644
--- a/components/button/style/mixin.less
+++ b/components/button/style/mixin.less
@@ -281,15 +281,33 @@
   .button-color(@error-color, @btn-default-bg, @error-color);
   &:hover,
   &:focus {
-    .button-color(
-      ~`colorPalette('@{error-color}', 5) `; @btn-default-bg; ~`colorPalette('@{error-color}', 5) `
-    );
+    & when (@theme = dark) {
+      .button-color(
+        ~`colorPalette('@{error-color}', 7) `; @btn-default-bg; ~`colorPalette('@{error-color}', 7)
+          `
+      );
+    }
+    & when not (@theme = dark) {
+      .button-color(
+        ~`colorPalette('@{error-color}', 5) `; @btn-default-bg; ~`colorPalette('@{error-color}', 5)
+          `
+      );
+    }
   }
   &:active,
   &.active {
-    .button-color(
-      ~`colorPalette('@{error-color}', 7) `; @btn-default-bg; ~`colorPalette('@{error-color}', 7) `
-    );
+    & when (@theme = dark) {
+      .button-color(
+        ~`colorPalette('@{error-color}', 5) `; @btn-default-bg; ~`colorPalette('@{error-color}', 5)
+          `
+      );
+    }
+    & when not (@theme = dark) {
+      .button-color(
+        ~`colorPalette('@{error-color}', 7) `; @btn-default-bg; ~`colorPalette('@{error-color}', 7)
+          `
+      );
+    }
   }
   .button-disabled();
 }
@@ -299,10 +317,20 @@
   box-shadow: none;
   &:hover,
   &:focus {
-    .button-color(~`colorPalette('@{error-color}', 5) `; transparent; transparent);
+    & when (@theme = dark) {
+      .button-color(~`colorPalette('@{error-color}', 7) `; transparent; transparent);
+    }
+    & when not (@theme = dark) {
+      .button-color(~`colorPalette('@{error-color}', 5) `; transparent; transparent);
+    }
   }
   &:active {
-    .button-color(~`colorPalette('@{error-color}', 7) `; transparent; transparent);
+    & when (@theme = dark) {
+      .button-color(~`colorPalette('@{error-color}', 5) `; transparent; transparent);
+    }
+    & when not (@theme = dark) {
+      .button-color(~`colorPalette('@{error-color}', 7) `; transparent; transparent);
+    }
   }
   .button-disabled(@disabled-color; transparent; transparent);
 }
diff --git a/components/date-picker/style/index.less b/components/date-picker/style/index.less
index 715d3b5fe5..6060c2e73f 100644
--- a/components/date-picker/style/index.less
+++ b/components/date-picker/style/index.less
@@ -204,6 +204,7 @@
 
   // ======================== Ranges ========================
   &-ranges {
+    margin-bottom: 0;
     padding: @padding-xs / 2 @padding-sm;
     overflow: hidden;
     line-height: @picker-text-height - 2 * @border-width-base - @padding-xs / 2;
diff --git a/components/style/themes/dark.less b/components/style/themes/dark.less
index 3618e89ab9..f380f318ef 100644
--- a/components/style/themes/dark.less
+++ b/components/style/themes/dark.less
@@ -254,7 +254,7 @@
 @input-bg: transparent;
 @input-placeholder-color: fade(@white, 30%);
 @input-number-handler-bg: transparent;
-@input-number-handler-active-bg: @popover-background;
+@input-number-handler-active-bg: @item-hover-bg;
 @input-icon-hover-color: fade(@white, 85%);
 
 // Select
@@ -301,7 +301,6 @@
 // Table
 // --
 @table-header-bg: #1d1d1d;
-@table-header-bg-sm: @table-header-bg;
 @table-body-sort-bg: fade(@white, 1%);
 @table-row-hover-bg: #262626;
 @table-header-sort-bg: #262626;
@@ -313,12 +312,6 @@
 
 // TimePicker
 // ---
-@time-picker-bg: @popover-background;
-@time-picker-inner-bg: @popover-background;
-@time-picker-panel-inner-bg: @popover-background;
-@month-panel-bg: @popover-background;
-@year-panel-bg: @popover-background;
-@picker-basic-cell-hover-color: @background-color-light;
 @picker-basic-cell-hover-with-range-color: #303030;
 @picker-basic-cell-disabled-bg: #303030;
 @picker-border-color: @border-color-split;
@@ -428,7 +421,6 @@
 // ---
 @timeline-color: @border-color-split;
 @timeline-dot-color: @primary-color;
-@timeline-dot-bg: transparent;
 
 // Mentions
 // ---
diff --git a/components/style/themes/default.less b/components/style/themes/default.less
index 2ee4767cea..4ce93efeff 100644
--- a/components/style/themes/default.less
+++ b/components/style/themes/default.less
@@ -516,14 +516,6 @@
 
 // TimePicker
 // ---
-@time-picker-bg: @component-background;
-@time-picker-panel-column-width: 56px;
-@time-picker-panel-width: @time-picker-panel-column-width * 3;
-@time-picker-selected-bg: @item-active-bg;
-@time-picker-inner-bg: @component-background;
-@time-picker-panel-inner-bg: @component-background;
-@month-panel-bg: @component-background;
-@year-panel-bg: @component-background;
 @picker-bg: @component-background;
 @picker-basic-cell-hover-color: @item-hover-bg;
 @picker-basic-cell-hover-with-range-color: lighten(@primary-color, 35%);
diff --git a/components/table/demo/summary.md b/components/table/demo/summary.md
index 8f6c5f8a98..4e2a261b3f 100644
--- a/components/table/demo/summary.md
+++ b/components/table/demo/summary.md
@@ -105,8 +105,8 @@ ReactDOM.render(
   #components-table-demo-summary tfoot td {
     background: #fafafa;
   }
-  [data-theme="dark"]  #components-table-demo-summary tfoot th,
-  #components-table-demo-summary tfoot td {
+  [data-theme="dark"] #components-table-demo-summary tfoot th,
+  [data-theme="dark"] #components-table-demo-summary tfoot td {
     background: #1d1d1d;
   }
 </style>
diff --git a/components/tag/demo/colorful.md b/components/tag/demo/colorful.md
index fb58c9f6c8..30bb4695e1 100644
--- a/components/tag/demo/colorful.md
+++ b/components/tag/demo/colorful.md
@@ -49,3 +49,9 @@ ReactDOM.render(
   margin-bottom: 8px;
 }
 ```
+
+<style>
+.code-box-demo .ant-tag {
+  margin-bottom: 8px;
+}
+<style>
diff --git a/components/transfer/style/customize.less b/components/transfer/style/customize.less
index 632c43708f..1f14aa8910 100644
--- a/components/transfer/style/customize.less
+++ b/components/transfer/style/customize.less
@@ -1,6 +1,7 @@
 @import './index.less';
 
 @table-prefix-cls: ~'@{ant-prefix}-table';
+@input-prefix-cls: ~'@{ant-prefix}-input';
 
 .@{transfer-prefix-cls}-customize-list {
   display: flex;
@@ -59,4 +60,9 @@
       margin: 16px 0 4px;
     }
   }
+  .@{input-prefix-cls} {
+    &[disabled] {
+      background-color: transparent;
+    }
+  }
 }
diff --git a/package.json b/package.json
index e55e169b90..8937eedae6 100644
--- a/package.json
+++ b/package.json
@@ -157,7 +157,7 @@
     "@types/warning": "^3.0.0",
     "@typescript-eslint/eslint-plugin": "^2.0.0",
     "@typescript-eslint/parser": "^2.10.0",
-    "antd-pro-merge-less": "^2.0.26",
+    "antd-pro-merge-less": "^2.0.28",
     "antd-theme-generator": "^1.1.6",
     "babel-eslint": "^10.0.1",
     "babel-plugin-add-react-displayname": "^0.0.5",
diff --git a/site/theme/static/common.less b/site/theme/static/common.less
index 209d66ff0c..f43481b168 100644
--- a/site/theme/static/common.less
+++ b/site/theme/static/common.less
@@ -182,6 +182,11 @@ a {
   bottom: 102px;
   z-index: 2147483640;
   cursor: pointer;
+  &-tooltip {
+    .ant-tooltip-inner {
+      min-width: 100px;
+    }
+  }
   & > div {
     display: block;
   }
diff --git a/site/theme/template/Content/MainContent.jsx b/site/theme/template/Content/MainContent.jsx
index 65a825c91d..4e5dfb8327 100644
--- a/site/theme/template/Content/MainContent.jsx
+++ b/site/theme/template/Content/MainContent.jsx
@@ -369,7 +369,11 @@ class MainContent extends Component {
             </section>
             {componentPage && (
               <div className="fixed-widgets">
-                <Tooltip title={formatMessage({ id: `app.theme.switch.${theme}` })}>
+                <Tooltip
+                  getPopupContainer={node => node.parentNode}
+                  title={formatMessage({ id: `app.theme.switch.${theme}` })}
+                  overlayClassName="fixed-widgets-tooltip"
+                >
                   <Avatar
                     className={classNames('fixed-widgets-avatar', `fixed-widgets-avatar-${theme}`)}
                     size={44}
diff --git a/site/theme/template/Home/Banner/index.less b/site/theme/template/Home/Banner/index.less
index 0fe0c764c1..74aa95f8cf 100644
--- a/site/theme/template/Home/Banner/index.less
+++ b/site/theme/template/Home/Banner/index.less
@@ -43,9 +43,9 @@
       button {
         height: auto;
         padding: 8px 24px;
+        color: @home-color;
         font-size: 14px;
         border-color: @home-color;
-        color: @home-color;
 
         &:hover {
           color: tint(@home-color, 20%);
@@ -53,8 +53,8 @@
         }
 
         &.ant-btn-primary {
-          background: @home-color;
           color: #fff;
+          background: @home-color;
 
           &:hover {
             background-color: tint(@home-color, 20%);
diff --git a/site/theme/template/Home/index.less b/site/theme/template/Home/index.less
index c3aeeea39f..48a3d92fd7 100644
--- a/site/theme/template/Home/index.less
+++ b/site/theme/template/Home/index.less
@@ -28,11 +28,11 @@
   }
 
   .home-link-arrow {
-    margin-left: 0.3em;
     position: relative;
+    margin-left: 0.3em;
     font-size: 0.85em;
-    transition: all 0.2s;
     opacity: 0.75;
+    transition: all 0.2s;
   }
 
   a:hover .home-link-arrow {