diff --git a/public/app/features/dashboard/partials/shareModal.html b/public/app/features/dashboard/partials/shareModal.html
index 26a49f2ab4e..6d7c132f378 100644
--- a/public/app/features/dashboard/partials/shareModal.html
+++ b/public/app/features/dashboard/partials/shareModal.html
@@ -2,7 +2,8 @@
 
 	<div class="modal-header">
 		<h2 class="modal-header-title">
-			{{modalTitle}}
+			<i class="fa fa-share-square-o"></i>
+			<span class="p-l-1">{{modalTitle}}</span>
 		</h2>
 
 		<ul class="gf-tabs">
diff --git a/public/app/features/dashboard/shareSnapshotCtrl.js b/public/app/features/dashboard/shareSnapshotCtrl.js
index a30caf7f1c9..617e54db59c 100644
--- a/public/app/features/dashboard/shareSnapshotCtrl.js
+++ b/public/app/features/dashboard/shareSnapshotCtrl.js
@@ -103,14 +103,17 @@ function (angular, _) {
     $scope.scrubDashboard = function(dash) {
       // change title
       dash.title = $scope.snapshot.name;
+
       // make relative times absolute
       dash.time = timeSrv.timeRange();
+
       // remove panel queries & links
-      dash.forEachPanel(function(panel) {
+      _.each(dash.panels, function(panel) {
         panel.targets = [];
         panel.links = [];
         panel.datasource = null;
       });
+
       // remove annotation queries
       dash.annotations.list = _.chain(dash.annotations.list)
       .filter(function(annotation) {
@@ -124,6 +127,7 @@ function (angular, _) {
           snapshotData: annotation.snapshotData
         };
       }).value();
+
       // remove template queries
       _.each(dash.templating.list, function(variable) {
         variable.query = "";
@@ -133,9 +137,12 @@ function (angular, _) {
 
       // snapshot single panel
       if ($scope.modeSharePanel) {
-        var singlePanel = dash.getPanelById($scope.panel.id);
-        singlePanel.span = 12;
-        dash.rows = [{ height: '500px', span: 12, panels: [singlePanel] }];
+        var singlePanel = $scope.panel.getSaveModel();
+        singlePanel.gridPos.w = 24;
+        singlePanel.gridPos.x = 0;
+        singlePanel.gridPos.y = 0;
+        singlePanel.gridPos.h = 20;
+        dash.panels = [singlePanel];
       }
 
       // cleanup snapshotData
diff --git a/public/sass/components/_modals.scss b/public/sass/components/_modals.scss
index c05ce92bae5..4046134a801 100644
--- a/public/sass/components/_modals.scss
+++ b/public/sass/components/_modals.scss
@@ -57,7 +57,7 @@
 
 .modal-header-close {
   float: right;
-  padding: 0.75rem $spacer;
+  padding: 9px $spacer;
 }
 
 // Body (where all modal content resides)