diff --git a/src/sass/gnome-shell/common/_calendar.scss b/src/sass/gnome-shell/common/_calendar.scss
index 5d81c251..5630a090 100644
--- a/src/sass/gnome-shell/common/_calendar.scss
+++ b/src/sass/gnome-shell/common/_calendar.scss
@@ -127,7 +127,8 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
   .calendar-month-label {
     margin: 0;
     padding: $base_padding 0;
-    color: $fg_color;
+    color: $fg_color !important;
+    background-color: transparent !important;
     font-weight: bold;
     font-size: 1em !important;
     text-align: center;
@@ -188,19 +189,6 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
       border-color: transparent; //avoid jumparound due to today
       box-shadow: none !important;
     }
-
-    &.calendar-day-heading {  //day of week heading
-      width: $menuitem_size !important;
-      height: $menuitem_size - 6px !important;
-      margin-top: 6px !important;
-      padding: 0 !important;
-      // border-radius: $circular_radius;
-      background-color: transparent;
-      color: $hint_fg_color;
-      @include font(caption);
-      font-weight: bold;
-      text-align: center;
-    }
   }
 
   .calendar-day { //border collapse hack - see calendar.js
@@ -267,13 +255,17 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
   .calendar-other-month-day {
     color: $disabled_fg_color !important;
     opacity: 1;
+
+    &.calendar-weekend {
+      color: $alt_disabled_fg_color !important;
+    }
   }
 
   .calendar-week-number {
     width: 22px;
     height: 16px;
     margin: 6px 6px 6px 4px;
-    padding: 0 0;
+    padding: 0;
     border-radius: $bt_radius;
     background-color: if($variant == 'light', rgba(black, 0.05), rgba(white, 0.05));
     color: $hint_fg_color;
@@ -281,6 +273,19 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
     font-weight: bold;
     text-align: center;
   }
+
+  .calendar-day-heading {  //day of week heading
+    width: $menuitem_size !important;
+    height: $menuitem_size - 6px !important;
+    margin: $base_margin;
+    padding: 0 !important;
+    // border-radius: $circular_radius;
+    background-color: transparent !important;
+    color: $hint_fg_color !important;
+    @include font(caption);
+    font-weight: bold;
+    text-align: center;
+  }
 }
 
 .world-clocks-button,
diff --git a/src/sass/gnome-shell/widgets-46-0/_app-grid.scss b/src/sass/gnome-shell/widgets-46-0/_app-grid.scss
index c4a40b2f..cfc5d328 100644
--- a/src/sass/gnome-shell/widgets-46-0/_app-grid.scss
+++ b/src/sass/gnome-shell/widgets-46-0/_app-grid.scss
@@ -19,18 +19,22 @@ $app_folder_size: 720px;
 
 // items in the app grid and dash
 .overview-tile {
+  color: $light_alt_fg_color;
   background-color: transparent;
 
-  &:focus { background-color: $light_divider_color; }
-  &:hover { background-color: $light_divider_color; }
-  &:active { background-color: $light_track_color; }
+  &:focus { color: $light_fg_color; background-color: $light_divider_color; }
+  &:hover { color: $light_fg_color; background-color: $light_divider_color; }
+  &:active { color: $light_fg_color; background-color: $light_track_color; }
   &:highlighted,&:selected,
-  &:checked { background-color: $light_track_color; }
-  &:insensitive { background-color: transparent; }
+  &:checked { color: $light_fg_color; background-color: $light_track_color; }
+  &:insensitive { color: $light_alt_disabled_fg_color; background-color: transparent; }
 
   // override the %tile style
   border-radius: $wm_radius * 1.5;
   padding: 12px;
+  spacing: $base_padding;
+  text-align: center;
+  transition-duration: 100ms;
 
   // the icon itself
   .overview-icon {
diff --git a/src/sass/gnome-shell/widgets-46-0/_dash.scss b/src/sass/gnome-shell/widgets-46-0/_dash.scss
index 62ac39a3..a04fc584 100644
--- a/src/sass/gnome-shell/widgets-46-0/_dash.scss
+++ b/src/sass/gnome-shell/widgets-46-0/_dash.scss
@@ -4,7 +4,7 @@ $dash_background_color: rgba(white, 0.15);
 $dash_placeholder_size: 32px;
 $dash_padding: $base_padding * 2;
 $dash_edge_offset: $base_margin * 3;
-$dash_border_radius: 16px + $dash_padding;
+$dash_border_radius: 20px + $dash_padding;
 $dash_spacing: $base_margin * 0.5;
 
 // container for the dash
@@ -41,29 +41,29 @@ $dash_spacing: $base_margin * 0.5;
     .show-apps,
     .overview-tile {
       // remove styles
-  background: none;
-  box-shadow: none;
-  border: none;
-  border-radius: 0;
-  padding: 0;
+      background: none;
+      box-shadow: none;
+      border: none;
+      border-radius: 0;
+      padding: 0;
       margin: 0 $dash_spacing;
       padding-bottom: $dash_edge_offset; // align with other items
 
       .overview-icon {
-  border-radius: 16px;
-  padding: $base_padding;
-  spacing: $base_padding;
-  text-align: center;
-  transition-duration: 100ms;
-  background: none;
+        border-radius: 20px;
+        padding: $base_padding;
+        spacing: $base_padding;
+        text-align: center;
+        transition-duration: 100ms;
+        background: none;
       }
 
-  &:focus .overview-icon { background-color: $light_divider_color; }
-  &:hover .overview-icon { background-color: $light_divider_color; }
-  &:active .overview-icon { background-color: $light_track_color; }
-  &:highlighted .overview-icon,&:selected .overview-icon,
-  &:checked .overview-icon { background-color: $light_track_color; }
-  &:insensitive .overview-icon { background-color: transparent; }
+      &:focus .overview-icon { background-color: $light_divider_color; }
+      &:hover .overview-icon { background-color: $light_divider_color; }
+      &:active .overview-icon { background-color: $light_track_color; }
+      &:highlighted .overview-icon,&:selected .overview-icon,
+      &:checked .overview-icon { background-color: $light_track_color; }
+      &:insensitive .overview-icon { background-color: transparent; }
     }
 
     // running app dot