diff --git a/src/app/features/dashboard/partials/shareDashboard.html b/src/app/features/dashboard/partials/shareDashboard.html
index a27e63cda58..673a7d98f07 100644
--- a/src/app/features/dashboard/partials/shareDashboard.html
+++ b/src/app/features/dashboard/partials/shareDashboard.html
@@ -50,9 +50,13 @@
 		<div class="share-snapshot-header" ng-if="step === 1">
 			<i ng-if="loading" class="fa fa-spinner fa-spin"></i>
 			<p class="share-snapshot-info-text">
-				A snapshot is an instant way to <strong>share</strong> a dashboard publicly. The visible data and series names
-				are embedded into the dashboard while metric queries and panel links are stripped. The snapshot can be viewed by
-				<strong>anyone</strong> that have the link and can reach the URL. <a href="http://docs.grafana.org/reference/snapshot" target="_blank">Read more</a>.
+				A snapshot is an instant way to share an interactive dashboard publicly.
+				When created, we <strong>strip sensitive data</strong> like queries (metric, template and annotation) and panel links,
+				leaving only the visible metric data and series names embedded into your dashboard.
+			</p>
+			<p class="share-snapshot-info-text">
+				Keep in mind, your <strong>snapshot can be viewed any anyone</strong> that has the link and can reach the URL.
+				Share wisely.
 			</p>
 		</div>
 
@@ -61,7 +65,7 @@
 				<div class="tight-form">
 					<ul class="tight-form-list">
 						<li class="tight-form-item" style="width: 110px;">
-							<strong>Snapshot name</strong>
+							Snapshot name
 						</li>
 						<li>
 							<input type="text" ng-model="snapshot.name" class="input-large tight-form-input last" >
@@ -72,7 +76,7 @@
 				<div class="tight-form">
 					<ul class="tight-form-list">
 						<li class="tight-form-item" style="width: 110px">
-							<strong>Expire</strong>
+							Expire
 						</li>
 						<li>
 							<select class="input-small tight-form-input last" style="width: 211px" ng-model="snapshot.expire" ng-options="f.value as f.text for f in expireOptions"></select>
diff --git a/src/css/less/grafana.less b/src/css/less/grafana.less
index 3599d939f33..f71ee78f3cc 100644
--- a/src/css/less/grafana.less
+++ b/src/css/less/grafana.less
@@ -55,7 +55,7 @@
   right: 0;
   margin-left: auto;
   margin-right: auto;
-  top: 30%;
+  top: 20%;
 }
 
 .dashboard-fullscreen {
@@ -299,13 +299,10 @@
   text-align: center;
 
   .share-snapshot-info-text {
-    margin: 10px 143px;
-  }
-  .share-snapshot-warning {
-    background-color: @grafanaTargetFuncBackground;
-    padding: 5px;
-    .fa {
-      color: @orange;
+    margin: 10px 105px;
+    strong {
+      color: @headingsColor;
+      font-weight: bold;
     }
   }
 
@@ -325,9 +322,6 @@
 
   .tight-form {
     text-align: left;
-    label {
-      display: inline;
-    }
   }
 
   .share-snapshot-link {