diff --git a/src/App.css b/src/App.css
index 38323bbf74..a5ca3c0558 100644
--- a/src/App.css
+++ b/src/App.css
@@ -121,9 +121,11 @@ div.endtime-input {
 }
 
 .graph-legend .legend-swatch {
-    width: 10px;
-    height: 10px;
-    background-color: red;
+    padding: 5px;
+    height: 5px;
+    outline-offset: 1px;
+    outline: 1.5px solid #ccc;
+    margin: 2px 8px 2px 0;
 }
 
 .graph {
diff --git a/src/Graph.tsx b/src/Graph.tsx
index caf6354cc5..93982a326c 100644
--- a/src/Graph.tsx
+++ b/src/Graph.tsx
@@ -12,7 +12,6 @@ require('flot/source/jquery.canvaswrapper');
 require('jquery.flot.tooltip');
 
 import Legend from './Legend';
-import metricToSeriesName from './MetricFomat';
 
 var graphID = 0;
 function getGraphID() {
@@ -152,8 +151,42 @@ class Graph extends PureComponent<GraphProps> {
     };
   }
 
+  getColors() {
+    let colors = [];
+    const colorPool = ["#edc240", "#afd8f8", "#cb4b4b", "#4da74d", "#9440ed"];
+    const colorPoolSize = colorPool.length;
+    let variation = 0;
+    const neededColors = this.props.data.result.length;
+
+    for (let i = 0; i < neededColors; i++) {
+      const c = ($ as any).color.parse(colorPool[i % colorPoolSize] || "#666");
+
+      // Each time we exhaust the colors in the pool we adjust
+      // a scaling factor used to produce more variations on
+      // those colors. The factor alternates negative/positive
+      // to produce lighter/darker colors.
+
+      // Reset the variation after every few cycles, or else
+      // it will end up producing only white or black colors.
+
+      if (i % colorPoolSize === 0 && i) {
+        if (variation >= 0) {
+          if (variation < 0.5) {
+            variation = -variation - 0.2;
+          } else variation = 0;
+        } else variation = -variation;
+      }
+
+      colors[i] = c.scale('rgb', 1 + variation);
+    }
+
+    return colors;
+  }
+
   getData() {
-    return this.props.data.result.map((ts: any /* TODO: Type this*/) => {
+    const colors = this.getColors();
+
+    return this.props.data.result.map((ts: any /* TODO: Type this*/, index: number) => {
       // Insert nulls for all missing steps.
       let data = [];
       let pos = 0;
@@ -169,9 +202,9 @@ class Graph extends PureComponent<GraphProps> {
       }
 
       return {
-        label: ts.metric !== null ? metricToSeriesName(ts.metric, true) : 'scalar',
         labels: ts.metric !== null ? ts.metric : {},
         data: data,
+        color: colors[index],
       };
     })
   }
diff --git a/src/Legend.tsx b/src/Legend.tsx
index 5d84b4e9da..272b96e834 100644
--- a/src/Legend.tsx
+++ b/src/Legend.tsx
@@ -8,19 +8,24 @@ interface LegendProps {
 
 class Legend extends PureComponent<LegendProps> {
   renderLegendItem(s: any) {
+    const seriesName = metricToSeriesName(s.labels, false);
     return (
-      <div key={s.label} className="legend-item">
-        <span className="legend-swatch">.</span>
-        <span className="legend-label">{s.label}</span>
-      </div>
+      <tr key={seriesName} className="legend-item">
+        <td>
+          <div className="legend-swatch" style={{backgroundColor: s.color}}></div>
+        </td>
+        <td>{seriesName}</td>
+      </tr>
     );
   }
 
   render() {
     return (
-      <div className="graph-legend">
-        {this.props.series.map((s: any) => {return this.renderLegendItem(s)})}
-      </div>
+      <table className="graph-legend">
+        <tbody>
+          {this.props.series.map((s: any) => {return this.renderLegendItem(s)})}
+        </tbody>
+      </table>
     );
   }
 }
diff --git a/src/MetricFomat.ts b/src/MetricFomat.ts
index 142c476a6c..b10f4d83c0 100644
--- a/src/MetricFomat.ts
+++ b/src/MetricFomat.ts
@@ -1,4 +1,7 @@
 function metricToSeriesName(labels: {[key: string]: string}, formatHTML: boolean): string {
+  if (labels === null) {
+    return 'scalar';
+  }
   let tsName = (labels.__name__ || '') + '{';
   let labelStrings: string[] = [];
   for (let label in labels) {