diff --git a/common/gtk-2.0/gtkrc b/common/gtk-2.0/gtkrc
index dffd215..60e5559 100644
--- a/common/gtk-2.0/gtkrc
+++ b/common/gtk-2.0/gtkrc
@@ -2,7 +2,7 @@ gtk-color-scheme = "base_color: #ffffff"
 gtk-color-scheme = "text_color: #5c616c"
 gtk-color-scheme = "bg_color: #f5f6f7"
 gtk-color-scheme = "fg_color: #5c616c"
-gtk-color-scheme = "tooltip_bg_color: #353945"
+gtk-color-scheme = "tooltip_bg_color: #4B5162"
 gtk-color-scheme = "tooltip_fg_color: #ffffff"
 gtk-color-scheme = "selected_bg_color: #5294e2"
 gtk-color-scheme = "selected_fg_color: #ffffff"
diff --git a/common/gtk-2.0/gtkrc-dark b/common/gtk-2.0/gtkrc-dark
index d9858e9..51e1285 100644
--- a/common/gtk-2.0/gtkrc-dark
+++ b/common/gtk-2.0/gtkrc-dark
@@ -2,7 +2,7 @@ gtk-color-scheme = "base_color: #404552"
 gtk-color-scheme = "text_color: #d3dae3"
 gtk-color-scheme = "bg_color: #383c4a"
 gtk-color-scheme = "fg_color: #d3dae3"
-gtk-color-scheme = "tooltip_bg_color: #353945"
+gtk-color-scheme = "tooltip_bg_color: #4B5162"
 gtk-color-scheme = "tooltip_fg_color: #ffffff"
 gtk-color-scheme = "selected_bg_color: #5294e2"
 gtk-color-scheme = "selected_fg_color: #ffffff"
diff --git a/common/gtk-2.0/gtkrc-darker b/common/gtk-2.0/gtkrc-darker
index a1a5829..3c933f1 100644
--- a/common/gtk-2.0/gtkrc-darker
+++ b/common/gtk-2.0/gtkrc-darker
@@ -2,7 +2,7 @@ gtk-color-scheme = "base_color: #ffffff"
 gtk-color-scheme = "text_color: #5c616c"
 gtk-color-scheme = "bg_color: #f5f6f7"
 gtk-color-scheme = "fg_color: #5c616c"
-gtk-color-scheme = "tooltip_bg_color: #353945"
+gtk-color-scheme = "tooltip_bg_color: #4B5162"
 gtk-color-scheme = "tooltip_fg_color: #ffffff"
 gtk-color-scheme = "selected_bg_color: #5294e2"
 gtk-color-scheme = "selected_fg_color: #ffffff"
diff --git a/common/gtk-3.0/3.14/gtk-dark.css b/common/gtk-3.0/3.14/gtk-dark.css
index 946a23b..8684c90 100644
--- a/common/gtk-3.0/3.14/gtk-dark.css
+++ b/common/gtk-3.0/3.14/gtk-dark.css
@@ -2155,7 +2155,7 @@ GtkInfoBar {
   color: #BAC3CF;
   border-radius: 2px; }
   .tooltip.background {
-    background-color: rgba(53, 57, 69, 0.95);
+    background-color: rgba(75, 81, 98, 0.95);
     background-clip: padding-box; }
   .tooltip.window-frame.csd {
     background-color: transparent; }
@@ -2320,7 +2320,7 @@ GtkVolumeButton.button {
     box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; }
   .window-frame.csd.tooltip {
     border-radius: 2px;
-    box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.55); }
+    box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.25); }
   .window-frame.csd.message-dialog {
     border-radius: 3px; }
 
diff --git a/common/gtk-3.0/3.14/gtk-darker.css b/common/gtk-3.0/3.14/gtk-darker.css
index 79a2683..f259f27 100644
--- a/common/gtk-3.0/3.14/gtk-darker.css
+++ b/common/gtk-3.0/3.14/gtk-darker.css
@@ -2158,7 +2158,7 @@ GtkInfoBar {
   color: #BAC3CF;
   border-radius: 2px; }
   .tooltip.background {
-    background-color: rgba(53, 57, 69, 0.95);
+    background-color: rgba(75, 81, 98, 0.95);
     background-clip: padding-box; }
   .tooltip.window-frame.csd {
     background-color: transparent; }
diff --git a/common/gtk-3.0/3.14/gtk-solid-dark.css b/common/gtk-3.0/3.14/gtk-solid-dark.css
index d58271f..3acb0b3 100644
--- a/common/gtk-3.0/3.14/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.14/gtk-solid-dark.css
@@ -2155,7 +2155,7 @@ GtkInfoBar {
   color: #BAC3CF;
   border-radius: 2px; }
   .tooltip.background {
-    background-color: #353945;
+    background-color: #4b5162;
     background-clip: padding-box; }
   .tooltip.window-frame.csd {
     background-color: transparent; }
@@ -2320,7 +2320,7 @@ GtkVolumeButton.button {
     box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; }
   .window-frame.csd.tooltip {
     border-radius: 2px;
-    box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.55); }
+    box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.25); }
   .window-frame.csd.message-dialog {
     border-radius: 3px; }
 
diff --git a/common/gtk-3.0/3.14/gtk-solid-darker.css b/common/gtk-3.0/3.14/gtk-solid-darker.css
index 871db98..a529278 100644
--- a/common/gtk-3.0/3.14/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.14/gtk-solid-darker.css
@@ -2158,7 +2158,7 @@ GtkInfoBar {
   color: #BAC3CF;
   border-radius: 2px; }
   .tooltip.background {
-    background-color: #353945;
+    background-color: #4b5162;
     background-clip: padding-box; }
   .tooltip.window-frame.csd {
     background-color: transparent; }
diff --git a/common/gtk-3.0/3.14/gtk-solid.css b/common/gtk-3.0/3.14/gtk-solid.css
index 6b01fea..e3eb932 100644
--- a/common/gtk-3.0/3.14/gtk-solid.css
+++ b/common/gtk-3.0/3.14/gtk-solid.css
@@ -2158,7 +2158,7 @@ GtkInfoBar {
   color: #BAC3CF;
   border-radius: 2px; }
   .tooltip.background {
-    background-color: #353945;
+    background-color: #4b5162;
     background-clip: padding-box; }
   .tooltip.window-frame.csd {
     background-color: transparent; }
diff --git a/common/gtk-3.0/3.14/gtk.css b/common/gtk-3.0/3.14/gtk.css
index 2629319..838218d 100644
--- a/common/gtk-3.0/3.14/gtk.css
+++ b/common/gtk-3.0/3.14/gtk.css
@@ -2158,7 +2158,7 @@ GtkInfoBar {
   color: #BAC3CF;
   border-radius: 2px; }
   .tooltip.background {
-    background-color: rgba(53, 57, 69, 0.95);
+    background-color: rgba(75, 81, 98, 0.95);
     background-clip: padding-box; }
   .tooltip.window-frame.csd {
     background-color: transparent; }
diff --git a/common/gtk-3.0/3.14/sass/_common.scss b/common/gtk-3.0/3.14/sass/_common.scss
index a38742e..22754de 100644
--- a/common/gtk-3.0/3.14/sass/_common.scss
+++ b/common/gtk-3.0/3.14/sass/_common.scss
@@ -2505,7 +2505,7 @@ GtkInfoBar {
   &.background {
     // background-color needs to be set this way otherwise it gets drawn twice
     // see https://bugzilla.gnome.org/show_bug.cgi?id=736155 for details.
-    background-color: $osd_bg_color;
+    background-color: lighten($osd_bg_color, 10%);
     background-clip: padding-box;
   }
 
@@ -2673,7 +2673,7 @@ GtkVolumeButton.button { padding: 8px; }
     }
     &.tooltip {
       border-radius: 2px;
-      box-shadow: 0 1px 3px 1px $_wm_border;
+      box-shadow: 0 1px 3px 1px if($variant == 'light', $_wm_border, transparentize($_wm_border, 0.3));
     }
     &.message-dialog { border-radius: 3px; }
   }
diff --git a/common/gtk-3.0/3.16/gtk-dark.css b/common/gtk-3.0/3.16/gtk-dark.css
index e1334e9..f70748b 100644
--- a/common/gtk-3.0/3.16/gtk-dark.css
+++ b/common/gtk-3.0/3.16/gtk-dark.css
@@ -2208,7 +2208,7 @@ GtkInfoBar {
   color: #BAC3CF;
   border-radius: 2px; }
   .tooltip.background {
-    background-color: rgba(53, 57, 69, 0.95);
+    background-color: rgba(75, 81, 98, 0.95);
     background-clip: padding-box; }
   .tooltip.window-frame.csd {
     background-color: transparent; }
@@ -2397,7 +2397,7 @@ GtkVolumeButton.button {
     box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; }
   .window-frame.csd.tooltip {
     border-radius: 2px;
-    box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.55); }
+    box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.25); }
   .window-frame.csd.message-dialog {
     border-radius: 3px; }
   .window-frame.solid-csd {
diff --git a/common/gtk-3.0/3.16/gtk-darker.css b/common/gtk-3.0/3.16/gtk-darker.css
index 8289efb..242c208 100644
--- a/common/gtk-3.0/3.16/gtk-darker.css
+++ b/common/gtk-3.0/3.16/gtk-darker.css
@@ -2211,7 +2211,7 @@ GtkInfoBar {
   color: #BAC3CF;
   border-radius: 2px; }
   .tooltip.background {
-    background-color: rgba(53, 57, 69, 0.95);
+    background-color: rgba(75, 81, 98, 0.95);
     background-clip: padding-box; }
   .tooltip.window-frame.csd {
     background-color: transparent; }
diff --git a/common/gtk-3.0/3.16/gtk-solid-dark.css b/common/gtk-3.0/3.16/gtk-solid-dark.css
index bcb6af6..e88b789 100644
--- a/common/gtk-3.0/3.16/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.16/gtk-solid-dark.css
@@ -2208,7 +2208,7 @@ GtkInfoBar {
   color: #BAC3CF;
   border-radius: 2px; }
   .tooltip.background {
-    background-color: #353945;
+    background-color: #4b5162;
     background-clip: padding-box; }
   .tooltip.window-frame.csd {
     background-color: transparent; }
@@ -2397,7 +2397,7 @@ GtkVolumeButton.button {
     box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; }
   .window-frame.csd.tooltip {
     border-radius: 2px;
-    box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.55); }
+    box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.25); }
   .window-frame.csd.message-dialog {
     border-radius: 3px; }
   .window-frame.solid-csd {
diff --git a/common/gtk-3.0/3.16/gtk-solid-darker.css b/common/gtk-3.0/3.16/gtk-solid-darker.css
index 3c0a070..470d40f 100644
--- a/common/gtk-3.0/3.16/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.16/gtk-solid-darker.css
@@ -2211,7 +2211,7 @@ GtkInfoBar {
   color: #BAC3CF;
   border-radius: 2px; }
   .tooltip.background {
-    background-color: #353945;
+    background-color: #4b5162;
     background-clip: padding-box; }
   .tooltip.window-frame.csd {
     background-color: transparent; }
diff --git a/common/gtk-3.0/3.16/gtk-solid.css b/common/gtk-3.0/3.16/gtk-solid.css
index d9d7a44..bc3bf76 100644
--- a/common/gtk-3.0/3.16/gtk-solid.css
+++ b/common/gtk-3.0/3.16/gtk-solid.css
@@ -2211,7 +2211,7 @@ GtkInfoBar {
   color: #BAC3CF;
   border-radius: 2px; }
   .tooltip.background {
-    background-color: #353945;
+    background-color: #4b5162;
     background-clip: padding-box; }
   .tooltip.window-frame.csd {
     background-color: transparent; }
diff --git a/common/gtk-3.0/3.16/gtk.css b/common/gtk-3.0/3.16/gtk.css
index a12d999..2c43a27 100644
--- a/common/gtk-3.0/3.16/gtk.css
+++ b/common/gtk-3.0/3.16/gtk.css
@@ -2211,7 +2211,7 @@ GtkInfoBar {
   color: #BAC3CF;
   border-radius: 2px; }
   .tooltip.background {
-    background-color: rgba(53, 57, 69, 0.95);
+    background-color: rgba(75, 81, 98, 0.95);
     background-clip: padding-box; }
   .tooltip.window-frame.csd {
     background-color: transparent; }
diff --git a/common/gtk-3.0/3.16/sass/_common.scss b/common/gtk-3.0/3.16/sass/_common.scss
index bc93983..819dc93 100644
--- a/common/gtk-3.0/3.16/sass/_common.scss
+++ b/common/gtk-3.0/3.16/sass/_common.scss
@@ -2593,7 +2593,7 @@ GtkInfoBar {
   &.background {
     // background-color needs to be set this way otherwise it gets drawn twice
     // see https://bugzilla.gnome.org/show_bug.cgi?id=736155 for details.
-    background-color: $osd_bg_color;
+    background-color: lighten($osd_bg_color, 10%);
     background-clip: padding-box;
   }
 
@@ -2780,7 +2780,7 @@ GtkVolumeButton.button { padding: 8px; }
     }
     &.tooltip {
       border-radius: 2px;
-      box-shadow: 0 1px 3px 1px $_wm_border;
+      box-shadow: 0 1px 3px 1px if($variant == 'light', $_wm_border, transparentize($_wm_border, 0.3));
     }
     &.message-dialog { border-radius: 3px; }
   }
diff --git a/common/gtk-3.0/3.18/gtk-dark.css b/common/gtk-3.0/3.18/gtk-dark.css
index c55af20..1d4ef57 100644
--- a/common/gtk-3.0/3.18/gtk-dark.css
+++ b/common/gtk-3.0/3.18/gtk-dark.css
@@ -2320,7 +2320,7 @@ GtkInfoBar {
   color: #BAC3CF;
   border-radius: 2px; }
   .tooltip.background {
-    background-color: rgba(53, 57, 69, 0.95);
+    background-color: rgba(75, 81, 98, 0.95);
     background-clip: padding-box; }
   .tooltip.window-frame.csd {
     background-color: transparent; }
@@ -2514,7 +2514,7 @@ GtkVolumeButton.button {
     box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; }
   .window-frame.csd.tooltip {
     border-radius: 2px;
-    box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.55); }
+    box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.25); }
   .window-frame.csd.message-dialog {
     border-radius: 3px; }
   .window-frame.solid-csd {
diff --git a/common/gtk-3.0/3.18/gtk-darker.css b/common/gtk-3.0/3.18/gtk-darker.css
index a51dd36..e2a1fad 100644
--- a/common/gtk-3.0/3.18/gtk-darker.css
+++ b/common/gtk-3.0/3.18/gtk-darker.css
@@ -2323,7 +2323,7 @@ GtkInfoBar {
   color: #BAC3CF;
   border-radius: 2px; }
   .tooltip.background {
-    background-color: rgba(53, 57, 69, 0.95);
+    background-color: rgba(75, 81, 98, 0.95);
     background-clip: padding-box; }
   .tooltip.window-frame.csd {
     background-color: transparent; }
diff --git a/common/gtk-3.0/3.18/gtk-solid-dark.css b/common/gtk-3.0/3.18/gtk-solid-dark.css
index 1b3f5eb..d5a4214 100644
--- a/common/gtk-3.0/3.18/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.18/gtk-solid-dark.css
@@ -2320,7 +2320,7 @@ GtkInfoBar {
   color: #BAC3CF;
   border-radius: 2px; }
   .tooltip.background {
-    background-color: #353945;
+    background-color: #4b5162;
     background-clip: padding-box; }
   .tooltip.window-frame.csd {
     background-color: transparent; }
@@ -2514,7 +2514,7 @@ GtkVolumeButton.button {
     box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; }
   .window-frame.csd.tooltip {
     border-radius: 2px;
-    box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.55); }
+    box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.25); }
   .window-frame.csd.message-dialog {
     border-radius: 3px; }
   .window-frame.solid-csd {
diff --git a/common/gtk-3.0/3.18/gtk-solid-darker.css b/common/gtk-3.0/3.18/gtk-solid-darker.css
index f5efc7a..258b29a 100644
--- a/common/gtk-3.0/3.18/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.18/gtk-solid-darker.css
@@ -2323,7 +2323,7 @@ GtkInfoBar {
   color: #BAC3CF;
   border-radius: 2px; }
   .tooltip.background {
-    background-color: #353945;
+    background-color: #4b5162;
     background-clip: padding-box; }
   .tooltip.window-frame.csd {
     background-color: transparent; }
diff --git a/common/gtk-3.0/3.18/gtk-solid.css b/common/gtk-3.0/3.18/gtk-solid.css
index 517d330..6f8e832 100644
--- a/common/gtk-3.0/3.18/gtk-solid.css
+++ b/common/gtk-3.0/3.18/gtk-solid.css
@@ -2327,7 +2327,7 @@ GtkInfoBar {
   color: #BAC3CF;
   border-radius: 2px; }
   .tooltip.background {
-    background-color: #353945;
+    background-color: #4b5162;
     background-clip: padding-box; }
   .tooltip.window-frame.csd {
     background-color: transparent; }
diff --git a/common/gtk-3.0/3.18/gtk.css b/common/gtk-3.0/3.18/gtk.css
index 1d20822..9fb09b8 100644
--- a/common/gtk-3.0/3.18/gtk.css
+++ b/common/gtk-3.0/3.18/gtk.css
@@ -2327,7 +2327,7 @@ GtkInfoBar {
   color: #BAC3CF;
   border-radius: 2px; }
   .tooltip.background {
-    background-color: rgba(53, 57, 69, 0.95);
+    background-color: rgba(75, 81, 98, 0.95);
     background-clip: padding-box; }
   .tooltip.window-frame.csd {
     background-color: transparent; }
diff --git a/common/gtk-3.0/3.18/sass/_common.scss b/common/gtk-3.0/3.18/sass/_common.scss
index 69af281..63904ee 100644
--- a/common/gtk-3.0/3.18/sass/_common.scss
+++ b/common/gtk-3.0/3.18/sass/_common.scss
@@ -2595,7 +2595,7 @@ GtkInfoBar {
   &.background {
     // background-color needs to be set this way otherwise it gets drawn twice
     // see https://bugzilla.gnome.org/show_bug.cgi?id=736155 for details.
-    background-color: $osd_bg_color;
+    background-color: lighten($osd_bg_color, 10%);
     background-clip: padding-box;
   }
 
@@ -2789,7 +2789,7 @@ GtkVolumeButton.button { padding: 8px; }
     }
     &.tooltip {
       border-radius: 2px;
-      box-shadow: 0 1px 3px 1px $_wm_border;
+      box-shadow: 0 1px 3px 1px if($variant == 'light', $_wm_border, transparentize($_wm_border, 0.3));
     }
     &.message-dialog { border-radius: 3px; }
   }
diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index 87ceb4e..83a88ac 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -2794,7 +2794,7 @@ tooltip {
   border-radius: 2px;
   box-shadow: none; }
   tooltip.background {
-    background-color: rgba(53, 57, 69, 0.95);
+    background-color: rgba(75, 81, 98, 0.95);
     background-clip: padding-box; }
     tooltip.background label {
       padding: 4px; }
@@ -2955,7 +2955,7 @@ decoration {
     box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; }
   tooltip.csd decoration {
     border-radius: 2px;
-    box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.55); }
+    box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.25); }
   messagedialog.csd decoration {
     border-radius: 3px; }
   .solid-csd decoration {
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index e89f368..d8449b8 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -2793,7 +2793,7 @@ tooltip {
   border-radius: 2px;
   box-shadow: none; }
   tooltip.background {
-    background-color: rgba(53, 57, 69, 0.95);
+    background-color: rgba(75, 81, 98, 0.95);
     background-clip: padding-box; }
     tooltip.background label {
       padding: 4px; }
diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css
index af746a3..2b41a57 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -2794,7 +2794,7 @@ tooltip {
   border-radius: 2px;
   box-shadow: none; }
   tooltip.background {
-    background-color: #353945;
+    background-color: #4b5162;
     background-clip: padding-box; }
     tooltip.background label {
       padding: 4px; }
@@ -2955,7 +2955,7 @@ decoration {
     box-shadow: 0 3px 6px rgba(0, 0, 0, 0.45), 0 0 0 1px #22242d; }
   tooltip.csd decoration {
     border-radius: 2px;
-    box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.55); }
+    box-shadow: 0 1px 3px 1px rgba(0, 0, 0, 0.25); }
   messagedialog.csd decoration {
     border-radius: 3px; }
   .solid-csd decoration {
diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css
index 3651180..17cb753 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -2793,7 +2793,7 @@ tooltip {
   border-radius: 2px;
   box-shadow: none; }
   tooltip.background {
-    background-color: #353945;
+    background-color: #4b5162;
     background-clip: padding-box; }
     tooltip.background label {
       padding: 4px; }
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index c16b3ba..41695e8 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -2797,7 +2797,7 @@ tooltip {
   border-radius: 2px;
   box-shadow: none; }
   tooltip.background {
-    background-color: #353945;
+    background-color: #4b5162;
     background-clip: padding-box; }
     tooltip.background label {
       padding: 4px; }
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index fafb64f..7f5edd6 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -2797,7 +2797,7 @@ tooltip {
   border-radius: 2px;
   box-shadow: none; }
   tooltip.background {
-    background-color: rgba(53, 57, 69, 0.95);
+    background-color: rgba(75, 81, 98, 0.95);
     background-clip: padding-box; }
     tooltip.background label {
       padding: 4px; }
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index 42c4211..b782b56 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -2878,7 +2878,7 @@ tooltip {
   &.background {
     // background-color needs to be set this way otherwise it gets drawn twice
     // see https://bugzilla.gnome.org/show_bug.cgi?id=736155 for details.
-    background-color: $osd_bg_color;
+    background-color: lighten($osd_bg_color, 10%);
     background-clip: padding-box;
 
     label { padding: 4px; }
@@ -3105,7 +3105,7 @@ decoration {
   }
   tooltip.csd & {
     border-radius: 2px;
-    box-shadow: 0 1px 3px 1px $_wm_border;
+    box-shadow: 0 1px 3px 1px if($variant == 'light', $_wm_border, transparentize($_wm_border, 0.3));
   }
   messagedialog.csd & {
     border-radius: 3px;