diff --git a/public/app/features/dashboard/unsavedChangesSrv.js b/public/app/features/dashboard/unsavedChangesSrv.js
index ffc82e198cd..d732335ade9 100644
--- a/public/app/features/dashboard/unsavedChangesSrv.js
+++ b/public/app/features/dashboard/unsavedChangesSrv.js
@@ -102,7 +102,6 @@ function(angular, _) {
         value.current = null;
         value.options = null;
       });
-
     };
 
     p.hasChanges = function() {
diff --git a/public/app/plugins/panel/pluginlist/module.html b/public/app/plugins/panel/pluginlist/module.html
index 339eb1fe649..b62dc352b00 100644
--- a/public/app/plugins/panel/pluginlist/module.html
+++ b/public/app/plugins/panel/pluginlist/module.html
@@ -10,7 +10,7 @@
 						<span class="pluginlist-title">{{plugin.name}}</span>
 						<span class="pluginlist-version">v{{plugin.info.version}}</span>
 				</a>
-				<a class="pluginlist-message pluginlist-message--update" ng-show="plugin.hasUpdate" ng-click="ctrl.updateAvailable(plugin, $event)" bs-tooltip="plugin.latestVersion">
+				<a class="pluginlist-message pluginlist-message--update" ng-show="plugin.hasUpdate" ng-click="ctrl.updateAvailable(plugin, $event)" bs-tooltip="'New version: ' + plugin.latestVersion">
 					Update available!
 				</a>
 				<span class="pluginlist-message pluginlist-message--enable" ng-show="!plugin.enabled && !plugin.hasUpdate">
diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss
index 75d7a67c547..bb5fdc0b026 100644
--- a/public/sass/_variables.dark.scss
+++ b/public/sass/_variables.dark.scss
@@ -252,12 +252,12 @@ $popover-help-color:      $text-color;
 
 // Tooltips and popovers
 // -------------------------
-$tooltipColor:            $text-color;
-$tooltipBackground:       $dark-5;
+$tooltipColor:            $popover-help-color;
+$tooltipBackground:       $popover-help-bg;
 $tooltipArrowWidth:       5px;
 $tooltipArrowColor:       $tooltipBackground;
 $tooltipLinkColor:        $link-color;
-$graph-tooltip-bg:        $dark-5;
+$graph-tooltip-bg:        $dark-4;
 
 // images
 $checkboxImageUrl: '../img/checkbox.png';
diff --git a/public/sass/components/_tooltip.scss b/public/sass/components/_tooltip.scss
index 2f1408dbec1..c200bf07af8 100644
--- a/public/sass/components/_tooltip.scss
+++ b/public/sass/components/_tooltip.scss
@@ -26,6 +26,7 @@
   text-align: center;
   text-decoration: none;
   background-color: $tooltipBackground;
+  border-radius: 4px;
 }
 
 // Arrows