diff --git a/src/core_plugins/kibana/public/discover/styles/main.less b/src/core_plugins/kibana/public/discover/styles/main.less
index f1b6644d22016c..11ba812c823fc0 100644
--- a/src/core_plugins/kibana/public/discover/styles/main.less
+++ b/src/core_plugins/kibana/public/discover/styles/main.less
@@ -132,10 +132,6 @@
       }
     }
 
-    .discover-table-row--highlight td {
-      background-color: #E2F1F6;
-    }
-
 .shard-failures {
   color: @discover-shard-failures-color;
   background-color: @discover-shard-failures-bg !important;
diff --git a/src/ui/public/doc_table/doc_table.less b/src/ui/public/doc_table/doc_table.less
index 9e34f736ca968d..8235f242fa6291 100644
--- a/src/ui/public/doc_table/doc_table.less
+++ b/src/ui/public/doc_table/doc_table.less
@@ -40,7 +40,6 @@ doc-table {
 
       .table-cell-filter {
         position: absolute;
-        background-color: @panel-bg;
         white-space: nowrap;
         right: 0;
       }
@@ -53,6 +52,13 @@ doc-table {
     }
   }
 
+  .discover-table-row--highlight {
+    td,
+    .docTableRowFilterButton {
+      background-color: #E2F1F6;
+    }
+  }
+
   .loading {
     opacity: @loading-opacity;
   }
@@ -74,18 +80,14 @@ doc-table {
  */
 .docTableRowFilterButton {
   appearance: none;
-  background-color: transparent;
+  background-color: @panel-bg;
   border: none;
-  padding: 0;
+  padding: 0 3px;
   font-size: 14px;
   line-height: 1; /* 1 */
   display: inline-block;
   opacity: 0; /* 2 */
 
-  & + & {
-    margin-left: 5px;
-  }
-
   &:focus {
     opacity: 1; /* 3 */
   }