diff --git a/cinnamon-shell/upstream/sass/_colors.scss b/cinnamon-shell/upstream/sass/_colors.scss
index 4e16afce..3d041e1b 100644
--- a/cinnamon-shell/upstream/sass/_colors.scss
+++ b/cinnamon-shell/upstream/sass/_colors.scss
@@ -25,8 +25,8 @@ $destructive_color: #F04A50;
 
 $insensitive_fg_color: if($variant == 'light', transparentize($fg_color, 0.45), transparentize($fg_color, 0.55));
 
-$tooltip_bg_color: #fbeaa0;
-$tooltip_fg_color: #4a4a4a;
+$tooltip_bg_color: transparentize(mix($selected_bg_color, black, 95%), 0.05);
+$tooltip_fg_color: $selected_fg_color;
 $tooltip_border_color: #d0d0d0;
 
 $osd_fg_color: #c3c3c3;
diff --git a/cinnamon-shell/upstream/sass/_common.scss b/cinnamon-shell/upstream/sass/_common.scss
index 889c8e6b..0d621473 100644
--- a/cinnamon-shell/upstream/sass/_common.scss
+++ b/cinnamon-shell/upstream/sass/_common.scss
@@ -239,14 +239,15 @@ StScrollBar {
 // Tooltip
 //
 #Tooltip {
-  border: 1px solid $tooltip_border_color;
-  border-radius: 3px;
-  padding: 5px 12px;
+  border: none;
+  border-radius: 5px;
+  padding: 12px 12px;
   background-color: $tooltip_bg_color;
   color: $tooltip_fg_color;
   font-size: 1em;
   font-weight: normal;
   text-align: center;
+  margin: 3px;
 }
 
 //
@@ -1046,15 +1047,15 @@ StScrollBar {
 // Notifications
 //
 #notification {
-  border: 1px solid $borders_color;
-  border-radius: 3px;
-  background-color: $bg_color;
+  border: none;
+  border-radius: 5px;
+  background-color: $selected_bg_color;
   padding: 13px;
   spacing-rows: 10px;
   spacing-columns: 10px;
   margin-from-right-edge-of-screen: 20px;
   width: 34em;
-  color: $fg_color;
+  color: $selected_fg_color;
 
   .popup-menu & {
     color: $fg_color;
@@ -1070,7 +1071,7 @@ StScrollBar {
 
   &.multi-line-notification {
     padding-bottom: 13px;
-    color: $fg_color;
+    color: $selected_fg_color;
   }
 
   &-scrollview {
@@ -1094,8 +1095,12 @@ StScrollBar {
   }
 
   &-button, &-icon-button {
-    @extend %button;
-    padding: 5px;
+    background-color: darken($selected_bg_color, 12%);
+    border-radius: 5px;
+    padding: 7px;
+    &:hover {
+      background-color: darken($selected_bg_color, 20%);
+    }
   }
 
   &-icon-button > StIcon { icon-size: 32px; }
@@ -1749,12 +1754,12 @@ StScrollBar {
   &-number-label {
     font-size: 0.8em;
     z-index: 99;
-    color: $tooltip_border_color;
+    color: $selected_fg_color;
   }
 
   &-badge {
     border-radius: 9999px;
-    background-color: $tooltip_fg_color;
+    background-color: $selected_bg_color;
     margin: 0;
   }