diff --git a/ui/src/shared/components/TableGraph.js b/ui/src/shared/components/TableGraph.js
index dd709afca4..02e1f280ea 100644
--- a/ui/src/shared/components/TableGraph.js
+++ b/ui/src/shared/components/TableGraph.js
@@ -107,14 +107,13 @@ class TableGraph extends Component {
       ? rowIndex > 0 && columnIndex === 0
       : isFixedRow
     const isFixedCorner = rowIndex === 0 && columnIndex === 0
-    const isLastRow = rowIndex === rowCount - 1
-    const isLastColumn = columnIndex === columnCount - 1
-    const isHighlighted =
-      rowIndex === parent.props.scrollToRow ||
-      columnIndex === parent.props.scrollToColumn ||
-      (rowIndex === hoveredRowIndex && hoveredRowIndex !== 0) ||
-      (columnIndex === hoveredColumnIndex && hoveredColumnIndex !== 0)
     const dataIsNumerical = _.isNumber(data[rowIndex][columnIndex])
+    const isHighlightedRow =
+      rowIndex === parent.props.scrollToRow ||
+      (rowIndex === hoveredRowIndex && hoveredRowIndex !== 0)
+    const isHighlightedColumn =
+      columnIndex === parent.props.scrollToColumn ||
+      (columnIndex === hoveredColumnIndex && hoveredColumnIndex !== 0)
 
     let cellStyle = style
 
@@ -135,9 +134,8 @@ class TableGraph extends Component {
       'table-graph-cell__fixed-row': isFixedRow,
       'table-graph-cell__fixed-column': isFixedColumn,
       'table-graph-cell__fixed-corner': isFixedCorner,
-      'table-graph-cell__last-row': isLastRow,
-      'table-graph-cell__last-column': isLastColumn,
-      'table-graph-cell__highlight': isHighlighted,
+      'table-graph-cell__highlight-row': isHighlightedRow,
+      'table-graph-cell__highlight-column': isHighlightedColumn,
       'table-graph-cell__numerical': dataIsNumerical,
     })
 
diff --git a/ui/src/style/components/table-graph.scss b/ui/src/style/components/table-graph.scss
index 4d38323043..21c952480f 100644
--- a/ui/src/style/components/table-graph.scss
+++ b/ui/src/style/components/table-graph.scss
@@ -28,13 +28,12 @@
   &:after {
     content: '';
     position: absolute;
-    top: -1px;
-    left: -1px;
-    width: calc(100% + 2px);
-    height: calc(100% + 2px);
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
     z-index: 5;
-    border: 2px solid $c-pool;
-    border-radius: 3px;
+    background-color: rgba(255,255,255,0.2);
     visibility: hidden;
     box-sizing: border-box;
   }
@@ -60,24 +59,13 @@
     color: $g18-cloud;
     background-color: $g5-pepper;
   }
-  &__last-row {
-    border-bottom: 0;
+  &__highlight-row:after,
+  &__highlight-column:after {
+    visibility: visible;
   }
-  &__last-column {
-    // border-right: 0;
-  }
-  &__highlight {
-    background-color: $g6-smoke;
-    color: $g16-pearl;
-  }
-  &__highlight:not(.table-graph-cell__fixed-row):not(.table-graph-cell__fixed-column):not(.table-graph-cell__fixed-corner) {
-    color: $g14-chromium;
-    background-color: $g6-smoke;
-  }
-  &:hover:not(.table-graph-cell__fixed-row):not(.table-graph-cell__fixed-column):not(.table-graph-cell__fixed-corner) {
-    color: $g20-white;
-    background-color: $g0-obsidian;
-    &:after {visibility: visible;}
+  &__highlight-row.table-graph-cell__highlight-column {
+    border-color: $g20-white;
+    &:after {visibility: hidden;}
   }
 }