diff --git a/data/theme/gnome-shell-sass/_drawing.scss b/data/theme/gnome-shell-sass/_drawing.scss
index e2b8b2779..cbd53c23e 100644
--- a/data/theme/gnome-shell-sass/_drawing.scss
+++ b/data/theme/gnome-shell-sass/_drawing.scss
@@ -265,10 +265,10 @@
   // reset
   @else if $t==undecorated {
     background-color: transparent;
-    background-color: none;
     &:insensitive {
       @include button(insensitive);
       background-color: transparent;
+      box-shadow: none;
     }
   }
 }
@@ -351,7 +351,6 @@
 
   @if $flat {
     @include button(undecorated);
-    box-shadow: none !important;
   } @else {
     @include button(normal);
   }
@@ -362,7 +361,7 @@
   &:insensitive {
     @include button(insensitive);
     @if $flat {
-     background-color: transparent;
+      background-color: transparent;
     }
   }
 }
diff --git a/data/theme/gnome-shell-sass/widgets/_calendar.scss b/data/theme/gnome-shell-sass/widgets/_calendar.scss
index 5bc8cebe6..f5d3f7b0f 100644
--- a/data/theme/gnome-shell-sass/widgets/_calendar.scss
+++ b/data/theme/gnome-shell-sass/widgets/_calendar.scss
@@ -33,6 +33,7 @@
 .calendar {
   @include card(flat);
   margin-top: 0;
+  padding: 0;
 
   // month header
   .calendar-month-header {
@@ -90,13 +91,13 @@
     }
 
     &.calendar-other-month {
-      color: transparentize($insensitive_fg_color, 0.7) !important;
+      color: $insensitive_fg_color;
       font-weight: normal;
+      font-style: italic;
     }
 
     &.calendar-today {
       @extend .button, .default;
-      color: $selected_fg_color; /* override weekends */
     }
 
     &.calendar-day-with-events {