diff --git a/src/app/panels/graph/axisEditor.html b/src/app/panels/graph/axisEditor.html
index 6470c12ed89..1c25fb26aab 100644
--- a/src/app/panels/graph/axisEditor.html
+++ b/src/app/panels/graph/axisEditor.html
@@ -43,7 +43,6 @@
 		<editor-opt-bool text="Show legend" model="panel.legend.show" change="get_data();"></editor-opt-bool>
 		<editor-opt-bool text="Include values" model="panel.legend.values" change="render()"></editor-opt-bool>
 		<editor-opt-bool text="Align as table" model="panel.legend.alignAsTable" change="render()"></editor-opt-bool>
-		<editor-opt-bool text="Big table mode" model="panel.legend.bigTableMode" change="render()"></editor-opt-bool>
 		<editor-opt-bool text="Right side" model="panel.legend.rightSide" change="render()"></editor-opt-bool>
   </div>
 
diff --git a/src/app/panels/graph/legend.js b/src/app/panels/graph/legend.js
index 9a8b8e37a7e..c01548afd9d 100644
--- a/src/app/panels/graph/legend.js
+++ b/src/app/panels/graph/legend.js
@@ -65,16 +65,17 @@ function (angular, app, _, kbn, $) {
 
           $container.toggleClass('graph-legend-table', panel.legend.alignAsTable);
 
-          if (panel.legend.bigTableMode) {
-            $container.toggleClass('graph-legend-big-table', true);
+          if (panel.legend.alignAsTable) {
             var header = '<tr>';
             header += '<th></th>';
             header += '<th></th>';
-            header += '<th>min</th>';
-            header += '<th>max</th>';
-            header += '<th>avg</th>';
-            header += '<th>current</th>';
-            header += '<th>total</th>';
+            if (panel.legend.values) {
+              if (panel.legend.min) { header += '<th>min</div>'; }
+              if (panel.legend.max) { header += '<th>max</div>'; }
+              if (panel.legend.avg) { header += '<th>avg</div>'; }
+              if (panel.legend.current) { header += '<th>current</div>'; }
+              if (panel.legend.total) { header += '<th>total</div>'; }
+            }
             header += '</tr>';
             $container.append($(header));
           }
diff --git a/src/css/less/graph.less b/src/css/less/graph.less
index bfcf2acf25c..438cb5d2379 100644
--- a/src/css/less/graph.less
+++ b/src/css/less/graph.less
@@ -53,6 +53,8 @@
 
 .graph-legend-table {
   display: table;
+  width: 100%;
+  margin: 0;
 
   .graph-legend-series {
     display: table-row;
@@ -63,73 +65,53 @@
     }
   }
 
-  .graph-legend-alias {
-    float: none;
-    display: table-cell;
-    white-space: nowrap;
-  }
-
-  .graph-legend-icon {
-    display: table-cell;
-    float: none;
-    white-space: nowrap;
-    padding: 0 4px;
-    top: 2px;
-  }
-
-  .graph-legend-value  {
-    float: none;
-    display: table-cell;
-    white-space: nowrap;
-    padding-left: 15px;
-  }
-}
-
-.graph-legend-big-table {
-  width: 100%;
-  margin: 0;
-
   td, .graph-legend-alias, .graph-legend-icon, .graph-legend-value {
-    padding: 2px 10px;
+    float: none;
+    display: table-cell;
     white-space: nowrap;
+    padding: 2px 10px;
     text-align: right;
     border-bottom: 1px solid @grafanaListBorderBottom;
-
-    &:first-child {
-      text-align: left;
-    }
-    &:last-child td {
-      border: none;
-    }
   }
 
   .graph-legend-icon {
     width: 5px;
-    padding-right: 0;
+    padding: 0;
+    top: 0;
+    .icon-minus {
+      position: relative;
+      top: 2px;
+    }
+  }
+
+ .graph-legend-value  {
+    padding-left: 15px;
   }
 
   .graph-legend-alias {
+    padding-left: 7px;
     text-align: left;
     width: 95%;
   }
 
+  .graph-legend-series:nth-child(odd) {
+    background-color: @grafanaListAccent;
+  }
+
+  .graph-legend-value {
+    &.current, &.max, &.min, &.total, &.avg {
+      &:before {
+        content: '';
+      }
+    }
+  }
+
   th {
     text-align: right;
     padding: 5px 10px;
     font-weight: bold;
     color: @blue
   }
-
-  .graph-legend-series:nth-child(odd) {
-    background-color: @grafanaListAccent;
-  }
-  .graph-legend-value {
-    &.current, &.max, &.min, &.total, &.avg {
-      &:before {
-        content: '';
-      }
-    }
-  }
 }
 
 .graph-legend-rightside {