diff --git a/packages/grafana-ui/src/components/Tooltip/_Tooltip.scss b/packages/grafana-ui/src/components/Tooltip/_Tooltip.scss
index 05246fbac0a..37f6b83c73f 100644
--- a/packages/grafana-ui/src/components/Tooltip/_Tooltip.scss
+++ b/packages/grafana-ui/src/components/Tooltip/_Tooltip.scss
@@ -20,11 +20,7 @@ $popper-margin-from-ref: 5px;
   background: $tooltipBackground;
   border-radius: $border-radius;
   box-shadow: 0 0 2px rgba(0, 0, 0, 0.5);
-  padding: 0px 8px;
-  height: 24px;
-  display: flex;
-  align-items: center;
-  //border: 1px #333333 solid;
+  padding: 3px 8px;
   color: $tooltipColor;
   font-weight: 500;
 
@@ -45,7 +41,6 @@ $popper-margin-from-ref: 5px;
   border-style: solid;
   position: absolute;
   margin: 0px;
-  display: none;
 }
 
 .popper__arrow {
diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss
index 71fc8551dda..bd9ab385bb9 100644
--- a/public/sass/_variables.dark.scss
+++ b/public/sass/_variables.dark.scss
@@ -307,9 +307,8 @@ $tooltipArrowWidth: 5px;
 $tooltipLinkColor: $link-color;
 $graph-tooltip-bg: $dark-1;
 
-$tooltipBackground: $popover-help-bg;
-$tooltipBackground:#e9edf2;
-$tooltipColor: #52545c;
+$tooltipBackground: $black;
+$tooltipColor: $text-color;
 $tooltipArrowColor: $tooltipBackground;
 $tooltipBackgroundError: $brand-danger;
 $tooltipBackgroundBrand: $brand-primary;
diff --git a/public/sass/components/_tooltip.scss b/public/sass/components/_tooltip.scss
index 650d8ba1b1a..09252fe4f54 100644
--- a/public/sass/components/_tooltip.scss
+++ b/public/sass/components/_tooltip.scss
@@ -8,8 +8,8 @@
   z-index: $zindex-tooltip;
   display: block;
   visibility: visible;
-  font-size: 11px;
   line-height: 1.4;
+  font-weight: 500;
   @include opacity(0);
 
   &.in {