diff --git a/public/sass/_variables.light.scss b/public/sass/_variables.light.scss
index 9acc652df4e..108836f051d 100644
--- a/public/sass/_variables.light.scss
+++ b/public/sass/_variables.light.scss
@@ -258,14 +258,14 @@ $infoBorder:              transparent;
 
 // Tooltips and popovers
 // -------------------------
-$tooltipColor:            $white;
-$tooltipBackground:       $gray-4;
+$tooltipColor:            $text-color;
+$tooltipBackground:       $gray-5;
 $tooltipArrowWidth:       5px;
 $tooltipArrowColor:       $tooltipBackground;
-$tooltipLinkColor:        darken($white,11%);
+$tooltipLinkColor:        $text-color;
 
 // popover
-$popover-bg:         $dark-4;
+$popover-bg:         $gray-5;
 $popover-color:      $text-color;
 
 $popover-help-bg:         $blue-dark;
diff --git a/public/sass/components/_submenu.scss b/public/sass/components/_submenu.scss
index a3d9ac5e886..e26ea2eee0f 100644
--- a/public/sass/components/_submenu.scss
+++ b/public/sass/components/_submenu.scss
@@ -10,6 +10,7 @@
 .annotation-segment {
   label.cr1 {
     margin-left: 5px;
+    margin-top: 3px;
   }
   padding: 8px 7px;
 }