diff --git a/public/app/plugins/datasource/cloudwatch/partials/config.html b/public/app/plugins/datasource/cloudwatch/partials/config.html
index c4b05f6acf9..2b06d2de035 100644
--- a/public/app/plugins/datasource/cloudwatch/partials/config.html
+++ b/public/app/plugins/datasource/cloudwatch/partials/config.html
@@ -46,7 +46,7 @@
     </div>
   </div>
   <div class="gf-form">
-    <label class="gf-form-label width-13">Custom Metrics namespace</label>
+    <label class="gf-form-label width-13">Custom Metrics</label>
     <input type="text" class="gf-form-input max-width-18" ng-model='ctrl.current.jsonData.customMetricsNamespaces' placeholder="Namespace1,Namespace2"></input>
     <info-popover mode="right-absolute">
       Namespaces of Custom Metrics
diff --git a/public/sass/_variables.dark.scss b/public/sass/_variables.dark.scss
index 9539da9ad8f..c4cc463d3ce 100644
--- a/public/sass/_variables.dark.scss
+++ b/public/sass/_variables.dark.scss
@@ -251,8 +251,8 @@ $infoText:                $blue-dark;
 $infoBackground:          $blue-dark;
 
 // popover
-$popover-bg:         $panel-bg;
-$popover-color:      $text-color;
+$popover-bg:              $panel-bg;
+$popover-color:           $text-color;
 
 $popover-help-bg:         $btn-secondary-bg;
 $popover-help-color:      $text-color;
diff --git a/public/sass/components/_drop.scss b/public/sass/components/_drop.scss
index cd42d1b6fa2..7349a8c7c5d 100644
--- a/public/sass/components/_drop.scss
+++ b/public/sass/components/_drop.scss
@@ -5,9 +5,9 @@ $useDropShadow: false;
 $attachmentOffset: 0%;
 $easing: cubic-bezier(0, 0, 0.265, 1.00);
 
-@include drop-theme("help", $popover-help-bg, $popover-help-color);
 @include drop-theme("error", $errorBackground, $popover-color);
-@include drop-theme("popover", $popover-bg, $popover-color, $brand-primary);
+@include drop-theme("popover", $popover-bg, $popover-color, #b3460d);
+@include drop-theme("help", $popover-bg, $popover-color, #b3460d);
 
 @include drop-animation-scale("drop", "help", $attachmentOffset: $attachmentOffset, $easing: $easing);
 @include drop-animation-scale("drop", "error", $attachmentOffset: $attachmentOffset, $easing: $easing);
diff --git a/public/sass/mixins/_drop_element.scss b/public/sass/mixins/_drop_element.scss
index d73837e0b59..f0adf6aae96 100644
--- a/public/sass/mixins/_drop_element.scss
+++ b/public/sass/mixins/_drop_element.scss
@@ -15,7 +15,7 @@
       word-wrap: break-word;
       max-width: 20rem;
       border: 1px solid $border-color;
-      box-shadow: 0 0 10px #f86e06;
+      box-shadow: 0 0 15px #5d3000;
 
       &:before {
         content: "";
@@ -158,7 +158,7 @@
       &:before {
         top: 100%;
         left: $popover-arrow-size;
-        border-top-color: $theme-bg;
+        border-top-color: $border-color;
       }
     }