diff --git a/components/cascader/style/index.less b/components/cascader/style/index.less
index 99e8541e9b..ee1f0d1a68 100644
--- a/components/cascader/style/index.less
+++ b/components/cascader/style/index.less
@@ -169,7 +169,7 @@
     overflow: auto;
     vertical-align: top;
     list-style: none;
-    border-right: @border-width-base @border-style-base @border-color-split;
+    border-right: @border-width-base @border-style-base @cascader-menu-border-color-split;
     -ms-overflow-style: -ms-autohiding-scrollbar; // https://github.com/ant-design/ant-design/issues/11857
 
     &:first-child {
diff --git a/components/modal/style/modal.less b/components/modal/style/modal.less
index 7aa7e6cfff..c0f2513561 100644
--- a/components/modal/style/modal.less
+++ b/components/modal/style/modal.less
@@ -83,7 +83,7 @@
     padding: 16px 24px;
     color: @text-color;
     background: @modal-header-bg;
-    border-bottom: @border-width-base @border-style-base @border-color-split;
+    border-bottom: @border-width-base @border-style-base @modal-header-border-color-split;
     border-radius: @border-radius-base @border-radius-base 0 0;
   }
 
diff --git a/components/style/themes/dark.less b/components/style/themes/dark.less
index 0276663d61..4ae31c42ad 100644
--- a/components/style/themes/dark.less
+++ b/components/style/themes/dark.less
@@ -158,6 +158,9 @@
 @primary-9: @blue-9; // unused
 @primary-10: @blue-10; // unused
 
+// -------- Colors -----------
+@error-color: @red-6;
+
 // Layer background
 @gray-11: #1f1f1f;
 @body-background: @black;
@@ -179,6 +182,7 @@
 // Border color
 @border-color-base: #434343; // base border outline a component
 @border-color-split: @gray-11; // split border inside a component
+@border-color-split-popover: #303030; // base border in Popover Container
 
 @background-color-light: fade(@white, 4%); // background of header and selected item
 @background-color-base: fade(@white, 8%); // Default grey background color
@@ -194,7 +198,7 @@
 
 // Shadow
 // ---
-@shadow-color: rgba(0, 0, 0, 0.15);
+@shadow-color: rgba(0, 0, 0, 0.45);
 @shadow-color-inverse: @component-background;
 @box-shadow-base: @shadow-2;
 @shadow-1-up: 0 -6px 16px -8px rgba(0, 0, 0, 0.24), 0 -9px 28px 0 rgba(0, 0, 0, 0.15),
@@ -214,9 +218,6 @@
 
 @btn-default-bg: transparent;
 
-@btn-danger-bg: @red-7;
-@btn-danger-border: @red-7;
-
 @btn-default-ghost-color: @text-color;
 @btn-default-ghost-border: fade(@white, 25%);
 
@@ -231,7 +232,9 @@
 // Modal
 // ---
 @modal-header-bg: @gray-11;
+@modal-header-border-color-split: @border-color-split-popover;
 @modal-content-bg: @gray-11;
+@modal-footer-border-color-split: @border-color-split-popover;
 
 // Radio
 // ---
@@ -266,6 +269,7 @@
 // ---
 @cascader-bg: transparent;
 @cascader-menu-bg: @gray-11;
+@cascader-menu-border-color-split: @border-color-split-popover;
 
 // Anchor
 // ---
@@ -296,9 +300,11 @@
 // --
 @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-filter-active-bg: @item-hover-bg;
-@table-header-sort-active-bg: @item-hover-bg;
+@table-header-sort-bg: #262626;
+@table-header-filter-active-bg: #434343;
+@table-header-sort-active-bg: #262626;
 
 // TimePicker
 // ---
@@ -371,9 +377,7 @@
 @slider-rail-background-color: fade(@white, 20%);
 @slider-rail-background-color-hover: @slider-rail-background-color;
 @slider-track-background-color: @primary-color;
-@slider-track-background-color-hover: @slider-track-background-color;
 @slider-handle-color: @primary-color;
-@slider-handle-color-hover: @slider-handle-color;
 
 // Skeleton
 // ---
diff --git a/components/style/themes/default.less b/components/style/themes/default.less
index 1badde6a80..a0d46d5ce1 100644
--- a/components/style/themes/default.less
+++ b/components/style/themes/default.less
@@ -113,6 +113,7 @@
 // Border color
 @border-color-base: hsv(0, 0, 85%); // base border outline a component
 @border-color-split: hsv(0, 0, 94%); // split border inside a component
+@border-color-split-popover: @border-color-split; // base border in Popover Container
 @border-color-inverse: @white;
 @border-width-base: 1px; // width of the border for a component
 @border-style-base: solid; // style of a components border
@@ -368,6 +369,7 @@
 @cascader-bg: @component-background;
 @cascader-item-selected-bg: @blue-1;
 @cascader-menu-bg: @component-background;
+@cascader-menu-border-color-split: @border-color-split;
 
 // Anchor
 // ---
@@ -411,6 +413,7 @@
 // --
 @modal-body-padding: 24px;
 @modal-header-bg: @component-background;
+@modal-header-border-color-split: @border-color-split;
 @modal-content-bg: @component-background;
 @modal-heading-color: @heading-color;
 @modal-footer-bg: transparent;
diff --git a/components/table/style/index.less b/components/table/style/index.less
index 51980387ed..96fc64fb6a 100644
--- a/components/table/style/index.less
+++ b/components/table/style/index.less
@@ -499,13 +499,7 @@
     }
 
     .@{table-prefix-cls}-cell-fix-left-last::after {
-      & when (@theme = dark) {
-        box-shadow: 0 1px 2px -2px rgba(0, 0, 0, 0.48), 0 3px 6px 0 rgba(0, 0, 0, 0.36),
-          0 5px 12px 4px rgba(0, 0, 0, 0.27);
-      }
-      & when not (@theme = dark) {
-        box-shadow: inset 10px 0 8px -8px darken(@shadow-color, 5%);
-      }
+      box-shadow: inset 10px 0 8px -8px darken(@shadow-color, 5%);
     }
   }
   &-ping-right {