diff --git a/public/app/features/panel/panel_directive.ts b/public/app/features/panel/panel_directive.ts
index b405dc67178..9960daabfbe 100644
--- a/public/app/features/panel/panel_directive.ts
+++ b/public/app/features/panel/panel_directive.ts
@@ -159,7 +159,7 @@ module.directive('grafanaPanel', function($rootScope) {
             position: 'right middle',
             classes: ctrl.error ? 'drop-error' : 'drop-help',
             openOn: 'hover',
-            hoverOpenDelay: 400,
+            hoverOpenDelay: 100,
           });
         }
       }
diff --git a/public/sass/components/_modals.scss b/public/sass/components/_modals.scss
index 78293ef801a..76539c0035a 100644
--- a/public/sass/components/_modals.scss
+++ b/public/sass/components/_modals.scss
@@ -67,6 +67,7 @@
 
 .modal-content {
   padding: $spacer*2;
+  min-height: $spacer*15;
 }
 
 // Remove bottom margin if need be
diff --git a/public/sass/pages/_dashboard.scss b/public/sass/pages/_dashboard.scss
index 24dc6f1a238..548d5228fd6 100644
--- a/public/sass/pages/_dashboard.scss
+++ b/public/sass/pages/_dashboard.scss
@@ -90,7 +90,7 @@ div.flot-text {
 }
 
 .panel-info-corner {
-  color: $text-color;
+  color: $text-muted;
   cursor: pointer;
   position: absolute;
   display: none;
@@ -102,14 +102,14 @@ div.flot-text {
 
   .fa {
     position: relative;
-    top: -2px;
-    left: -5px;
-    font-size: 90%;
+    top: -4px;
+    left: -6px;
+    font-size: 75%;
   }
 
   &--info {
     display: block;
-    background: $blue-dark;
+    background: lighten($panel-bg, 4%);
     .fa:before {
       content: "\f129";
     }
@@ -117,9 +117,9 @@ div.flot-text {
 
   &--links {
     display: block;
-    background: $blue-dark;
+    background: lighten($panel-bg, 4%);
     .fa {
-      left: -3px;
+      left: -5px;
     }
     .fa:before {
       content: "\f08e";
@@ -128,6 +128,7 @@ div.flot-text {
 
   &--error {
     display: block;
+    color: $text-color;
     background: $errorBackground !important;
     .fa:before {
       content: "\f12a";