diff --git a/pkg/api/index.go b/pkg/api/index.go
index 09ef756f95a..342de21c670 100644
--- a/pkg/api/index.go
+++ b/pkg/api/index.go
@@ -62,7 +62,7 @@ func setIndexViewData(c *middleware.Context) (*dtos.IndexViewData, error) {
 
 	data.MainNavLinks = append(data.MainNavLinks, &dtos.NavLink{
 		Text: "Snapshots",
-		Icon: "fa fa-fw fa-camera-retro",
+		Icon: "fa-fw icon-gf icon-gf-snapshot",
 		Url:  "/dashboard/snapshots",
 	})
 
diff --git a/public/app/core/routes/all.js b/public/app/core/routes/all.js
index 6c6ec4f0724..2d313d7322f 100644
--- a/public/app/core/routes/all.js
+++ b/public/app/core/routes/all.js
@@ -138,7 +138,7 @@ define([
         controller : 'ResetPasswordCtrl',
       })
       .when('/dashboard/snapshots', {
-        templateUrl: 'app/features/snapshot/partials/snapshots.html',
+        templateUrl: 'public/app/features/snapshot/partials/snapshots.html',
         controller : 'SnapshotsCtrl',
         controllerAs: 'ctrl',
       })
diff --git a/public/app/features/panel/metrics_panel_ctrl.ts b/public/app/features/panel/metrics_panel_ctrl.ts
index 09626131149..1e6f34775f5 100644
--- a/public/app/features/panel/metrics_panel_ctrl.ts
+++ b/public/app/features/panel/metrics_panel_ctrl.ts
@@ -47,10 +47,6 @@ class MetricsPanelCtrl extends PanelCtrl {
     this.datasources = this.datasourceSrv.getMetricSources();
   }
 
-  refresh() {
-    this.getData();
-  }
-
   refreshData(data) {
     // null op
     return this.$q.when(data);
@@ -61,13 +57,14 @@ class MetricsPanelCtrl extends PanelCtrl {
     return data;
   }
 
-  getData() {
+  refresh() {
     // ignore fetching data if another panel is in fullscreen
     if (this.otherPanelInFullscreenMode()) { return; }
 
     // if we have snapshot data use that
     if (this.panel.snapshotData) {
       if (this.loadSnapshot) {
+        this.updateTimeRange();
         this.loadSnapshot(this.panel.snapshotData);
       }
       return;
diff --git a/public/app/features/snapshot/partials/snapshots.html b/public/app/features/snapshot/partials/snapshots.html
index 4a1d44d38a4..3bbc671e184 100644
--- a/public/app/features/snapshot/partials/snapshots.html
+++ b/public/app/features/snapshot/partials/snapshots.html
@@ -1,4 +1,4 @@
-<navbar icon="fa fa-fw fa-camera-retro" title="Dashboard snapshots"></navbar>
+<navbar icon="icon-gf icon-gf-snapshot" title="Dashboard snapshots"></navbar>
 
 <div class="page-container">
   <div class="page-wide">
@@ -11,9 +11,9 @@
         <th><strong>Snapshot url</strong></th>
         <th style="width: 70px"></th>
         <th style="width: 25px"></th>
-     
+
      </thead>
-      
+
       <tr ng-repeat="snapshot in ctrl.snapshots">
         <td>
 					<a href="dashboard/snapshot/{{snapshot.key}}">{{snapshot.name}}</a>
diff --git a/public/app/plugins/datasource/prometheus/query_ctrl.ts b/public/app/plugins/datasource/prometheus/query_ctrl.ts
index 7c11351e239..c215b184275 100644
--- a/public/app/plugins/datasource/prometheus/query_ctrl.ts
+++ b/public/app/plugins/datasource/prometheus/query_ctrl.ts
@@ -9,6 +9,7 @@ import {QueryCtrl} from 'app/features/panel/panel';
 
 class PrometheusQueryCtrl extends QueryCtrl {
   static templateUrl = 'public/app/plugins/datasource/prometheus/partials/query.editor.html';
+
   metric: any;
   resolutions: any;
   oldTarget: any;
diff --git a/public/app/plugins/panel/graph/module.ts b/public/app/plugins/panel/graph/module.ts
index f2ca91efa2b..7b7db37a0d5 100644
--- a/public/app/plugins/panel/graph/module.ts
+++ b/public/app/plugins/panel/graph/module.ts
@@ -152,7 +152,6 @@ class GraphCtrl extends MetricsPanelCtrl {
   }
 
   loadSnapshot(snapshotData) {
-    this.updateTimeRange();
     this.annotationsPromise = this.annotationsSrv.getAnnotations(this.dashboard);
     this.dataHandler(snapshotData);
   }
diff --git a/public/app/plugins/panel/singlestat/module.ts b/public/app/plugins/panel/singlestat/module.ts
index 8c6498778bd..24d6af46c26 100644
--- a/public/app/plugins/panel/singlestat/module.ts
+++ b/public/app/plugins/panel/singlestat/module.ts
@@ -79,7 +79,6 @@ class SingleStatCtrl extends MetricsPanelCtrl {
   }
 
   loadSnapshot(snapshotData) {
-    this.updateTimeRange();
     this.dataHandler(snapshotData);
   }