diff --git a/src/ui/public/styles/dark-theme.less b/src/ui/public/styles/dark-theme.less
index d74688185d1c1d5..3ab86b12ea1216b 100644
--- a/src/ui/public/styles/dark-theme.less
+++ b/src/ui/public/styles/dark-theme.less
@@ -142,9 +142,11 @@
     }
   }
 
-  .panel-default {
+  .panel--edit-mode {
     border-color: @panel-default-border;
+  }
 
+  .panel-default {
     & > .panel-heading {
       color: @panel-default-text;
       background-color: @panel-default-heading-bg;
@@ -262,6 +264,11 @@
     }
   }
 
+  .discover-table-row {
+    .docTableRowFilterButton {
+      background-color: @panel-bg;
+    }
+  }
 
 // /src/ui/public/visualize/visualize.less
   .visualize-show-spy {
@@ -578,15 +585,6 @@
       }
     }
   }
-
-// /src/ui/public/doc_table/doc_table.less
-  .discover-table-row {
-    td {
-      .table-cell-filter {
-        background-color: @panel-bg;
-      }
-    }
-  }
 }
 
 .theme-dark {
diff --git a/src/ui/public/styles/dark-variables.less b/src/ui/public/styles/dark-variables.less
index e8487a954c54923..4bd6b74327b569f 100644
--- a/src/ui/public/styles/dark-variables.less
+++ b/src/ui/public/styles/dark-variables.less
@@ -61,7 +61,7 @@
 @panel-inner-border:                          @dashboard-bg;
 
 @panel-default-text:                          @brand-primary;
-@panel-default-border:                        @dashboard-bg;
+@panel-default-border:                        #8d8d8d;
 @panel-default-heading-bg:                    @dashboard-bg;
 
 @dashboard-panel-bg:                          @dashboard-bg;