diff --git a/public/app/features/dashboard/dashnav/dashnav.html b/public/app/features/dashboard/dashnav/dashnav.html
index 1e416b4f90d..89f9f301729 100644
--- a/public/app/features/dashboard/dashnav/dashnav.html
+++ b/public/app/features/dashboard/dashnav/dashnav.html
@@ -27,13 +27,17 @@
 	<li ng-show="dashboardMeta.canShare" class="dropdown">
 		<a class="pointer" ng-click="hideTooltip($event)" bs-tooltip="'Share dashboard'" data-placement="bottom" data-toggle="dropdown"><i class="fa fa-share-square-o"></i></a>
 		<ul class="dropdown-menu">
-			<li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="shareDashboard(0)">
-				<i class="fa fa-link"></i>
-				Link to Dashboard</a></li>
-			<li ng-if="dashboardMeta.canEdit"><a class="pointer" ng-click="shareDashboard(1)">
-				<i class="gf-icon gf-icon-snap-multi"></i>
-				Snapshot sharing</a></li>
-		</ul>				
+			<li ng-if="dashboardMeta.canEdit">
+				<a class="pointer" ng-click="shareDashboard(0)">
+					<i class="fa fa-link"></i> Link to Dashboard
+				</a>
+			</li>
+			<li ng-if="dashboardMeta.canEdit">
+				<a class="pointer" ng-click="shareDashboard(1)">
+					<i class="icon-gf icon-gf-snapshot"></i>Snapshot sharing
+				</a>
+			</li>
+		</ul>
 	</li>
 	<li ng-show="dashboardMeta.canSave">
 		<a ng-click="saveDashboard()" bs-tooltip="'Save dashboard'" data-placement="bottom"><i class="fa fa-save"></i></a>
diff --git a/public/app/features/panel/panel_menu.js b/public/app/features/panel/panel_menu.js
index c0cf8e77f02..b23da0f2a88 100644
--- a/public/app/features/panel/panel_menu.js
+++ b/public/app/features/panel/panel_menu.js
@@ -12,7 +12,7 @@ function (angular, $, _) {
       var linkTemplate =
           '<span class="panel-title drag-handle pointer">' +
             '<span class="panel-title-text drag-handle">{{ctrl.panel.title | interpolateTemplateVars:this}}</span>' +
-            '<span class="panel-links-btn"><i class="fa fa-link"></i></span>' +
+            '<span class="panel-links-btn"><i class="fa fa-external-link"></i></span>' +
             '<span class="panel-time-info" ng-show="ctrl.timeInfo"><i class="fa fa-clock-o"></i> {{ctrl.timeInfo}}</span>' +
           '</span>';
 
@@ -28,6 +28,7 @@ function (angular, $, _) {
         }
         return template;
       }
+
       function createMenuTemplate(ctrl) {
         var template = '<div class="panel-menu small">';
 
@@ -124,8 +125,8 @@ function (angular, $, _) {
             }
 
             var menuTemplate;
-            if ($(e.target).hasClass('fa-link')) {
-              menuTemplate = createExternalLinkMenu($scope);
+            if ($(e.target).hasClass('fa-external-link')) {
+              menuTemplate = createExternalLinkMenu(ctrl);
             } else {
               menuTemplate = createMenuTemplate(ctrl);
             }