diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 46776b3f67..3fedcf7d93 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -1747,11 +1747,11 @@ GtkExpander {
  ***********/
 GtkCalendar { 
   border: 1px solid $borders_color; 
-  &.button { 
+  &.button {
     @extend %undecorated_button; 
-    padding: 0 4px; 
+    padding: 0 4px; //FIXME no effect on these pseudobuttons
     color: mix($fg_color, $base_color, 40%); //we need a dimmed stuff var 
-    &:hover { 
+    &:hover {
       @extend %undecorated_button; 
       color: $fg_color; 
     } 
@@ -1759,7 +1759,14 @@ GtkCalendar {
       @extend %undecorated_button; 
       color: mix($backdrop_fg_color, $backdrop_base_color, 50%); 
     } 
-  } 
+  }
+  &.view { border-radius: 2px; }
+  &.header {
+    background: linear-gradient(to bottom,
+                                lighten($bg_color,2%),
+                                darken($bg_color,2%));
+    border-bottom-color: mix($borders_color,$bg_color,50%);
+  }
 }
 
 /***********
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index a1de0964fb..f4237439f9 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -2338,6 +2338,11 @@ GtkCalendar {
       color: #eeeeec; }
     GtkCalendar.button:backdrop, GtkCalendar.button:backdrop:hover {
       color: #7a7b7a; }
+  GtkCalendar.view {
+    border-radius: 2px; }
+  GtkCalendar.header {
+    background: linear-gradient(to bottom, #3e4444, #343a3a);
+    border-bottom-color: #2a2f2f; }
 
 /***********
  * Dialogs *
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 16c19c7651..bf6a1ed13e 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -2336,6 +2336,11 @@ GtkCalendar {
       color: #2e3436; }
     GtkCalendar.button:backdrop, GtkCalendar.button:backdrop:hover {
       color: #a8aaab; }
+  GtkCalendar.view {
+    border-radius: 2px; }
+  GtkCalendar.header {
+    background: linear-gradient(to bottom, #f2f2f2, #e8e8e8);
+    border-bottom-color: #c7c7c7; }
 
 /***********
  * Dialogs *