diff --git a/src/plugins/discover/public/application/angular/doc_table/components/table_row.ts b/src/plugins/discover/public/application/angular/doc_table/components/table_row.ts
index 4911f207f0a5..17f3199b75b1 100644
--- a/src/plugins/discover/public/application/angular/doc_table/components/table_row.ts
+++ b/src/plugins/discover/public/application/angular/doc_table/components/table_row.ts
@@ -109,7 +109,7 @@ export function createTableRowDirective($compile: ng.ICompileService) {
       });
 
       $scope.inlineFilter = function inlineFilter($event: any, type: string) {
-        const column = $($event.target).data().column;
+        const column = $($event.currentTarget).data().column;
         const field = $scope.indexPattern.fields.getByName(column);
         $scope.filter(field, $scope.flattenedRow[column], type);
       };
diff --git a/src/plugins/discover/public/application/angular/doc_table/components/table_row/cell.html b/src/plugins/discover/public/application/angular/doc_table/components/table_row/cell.html
index e8c4fceeca7f..0d17c2ca94ca 100644
--- a/src/plugins/discover/public/application/angular/doc_table/components/table_row/cell.html
+++ b/src/plugins/discover/public/application/angular/doc_table/components/table_row/cell.html
@@ -14,24 +14,24 @@ if (timefield) {
     <% if (filterable) { %>
       <button
         ng-click="inlineFilter($event, '+')"
-        class="fa fa-search-plus kbnDocTableRowFilterButton"
+        class="kbnDocTableRowFilterButton"
         data-column="<%- column %>"
         tooltip-append-to-body="1"
         data-test-subj="docTableCellFilter"
         tooltip="{{ ::'discover.docTable.tableRow.filterForValueButtonTooltip' | i18n: {defaultMessage: 'Filter for value'} }}"
         tooltip-placement="bottom"
         aria-label="{{ ::'discover.docTable.tableRow.filterForValueButtonAriaLabel' | i18n: {defaultMessage: 'Filter for value'} }}"
-      ></button>
+      ><icon type="'plusInCircle'" size="'s'" color="'primary'"></icon></button>
       <button
         ng-click="inlineFilter($event, '-')"
-        class="fa fa-search-minus kbnDocTableRowFilterButton"
+        class="kbnDocTableRowFilterButton"
         data-column="<%- column %>"
         data-test-subj="docTableCellFilterNegate"
         tooltip="{{ ::'discover.docTable.tableRow.filterOutValueButtonTooltip' | i18n: {defaultMessage: 'Filter out value'} }}"
         aria-label="{{ ::'discover.docTable.tableRow.filterOutValueButtonAriaLabel' | i18n: {defaultMessage: 'Filter out value'} }}"
         tooltip-append-to-body="1"
         tooltip-placement="bottom"
-      ></button>
+      ><icon type="'minusInCircle'" size="'s'" color="'primary'"></icon></button>
     <% } %>
   </span>
 </td>