diff --git a/data/gnome-shell-theme.gresource.xml b/data/gnome-shell-theme.gresource.xml
index 30d9dc452..53aab77c4 100644
--- a/data/gnome-shell-theme.gresource.xml
+++ b/data/gnome-shell-theme.gresource.xml
@@ -5,7 +5,6 @@
     <file>calendar-today-light.svg</file>
     <file>gnome-shell-dark.css</file>
     <file>gnome-shell-light.css</file>
-    <file>gnome-shell-high-contrast.css</file>
     <file>gnome-shell-start.svg</file>
     <file>pad-osd.css</file>
     <file>workspace-placeholder.svg</file>
diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss
index 846427e8e..373fd4efd 100644
--- a/data/theme/gnome-shell-sass/_common.scss
+++ b/data/theme/gnome-shell-sass/_common.scss
@@ -223,9 +223,9 @@ stage {
 
 // tooltip
 %tooltip {
-  background-color: transparentize(black, 0.1);
-  border: 1px solid transparentize($light_1, 0.9);
-  color: $light_1;
+  background-color: transparentize($bg_color, 0.1);
+  border: 1px solid transparentize($base_color, 0.9);
+  color: $fg_color;
 
   border-radius: $forced_circular_radius;
   padding: $base_padding $base_padding * 2;
diff --git a/data/theme/gnome-shell-sass/widgets/_calendar.scss b/data/theme/gnome-shell-sass/widgets/_calendar.scss
index a4c6a8870..6e0cef1c4 100644
--- a/data/theme/gnome-shell-sass/widgets/_calendar.scss
+++ b/data/theme/gnome-shell-sass/widgets/_calendar.scss
@@ -33,6 +33,8 @@
   .date-label {
     @extend %title_2;
   }
+
+  color: $fg_color !important;
 }
 
 // the mini calendar