diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index adfa4d7bd5..3fc226bb52 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -1624,23 +1624,21 @@ GtkExpander {
 /************
  * Calendar *
  ***********/
-
-GtkCalendar {
-  border: 1px solid $borders_color;
-  &.button {
-    padding: 0 4px;
-    color: mix($borders_color, $base_color, 50%); //we need a dimmed stuff var
-    background-image: none;
-    background-color: transparent;
-    &:hover {
-      background-image: none;
-      color: $fg_color;
-    }
-    &:backdrop, &:backdrop:hover {
-      color: mix($backdrop_borders_color, $backdrop_base_color, 50%);
-      background-image: none;
-    }
-  }
+GtkCalendar { 
+  border: 1px solid $borders_color; 
+  &.button { 
+    @extend %undecorated_button; 
+    padding: 0 4px; 
+    color: mix($fg_color, $base_color, 40%); //we need a dimmed stuff var 
+    &:hover { 
+      @extend %undecorated_button; 
+      color: $fg_color; 
+    } 
+    &:backdrop, &:backdrop:hover { 
+      @extend %undecorated_button; 
+      color: mix($backdrop_fg_color, $backdrop_base_color, 50%); 
+    } 
+  } 
 }
 
 /***********
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 934bd8d36f..29ff115032 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -435,7 +435,7 @@
     border-radius: 3px;
     border-style: solid; }
 
-.button:link, .button:visited, .button:link:hover, .button:link:active, .button:visited:hover, .button:visited:active, .button:link:backdrop, .button:visited:backdrop, .notebook tab .button {
+.button:link, .button:visited, .button:link:hover, .button:link:active, .button:visited:hover, .button:visited:active, .button:link:backdrop, .button:visited:backdrop, .notebook tab .button, GtkCalendar.button, GtkCalendar.button:hover, GtkCalendar.button:backdrop, GtkCalendar.button:backdrop:hover {
   border-color: transparent;
   background-color: transparent;
   background-image: none;
@@ -2196,15 +2196,11 @@ GtkCalendar {
   border: 1px solid #1c1f1f; }
   GtkCalendar.button {
     padding: 0 4px;
-    color: #222424;
-    background-image: none;
-    background-color: transparent; }
+    color: #777777; }
     GtkCalendar.button:hover {
-      background-image: none;
       color: #eeeeec; }
     GtkCalendar.button:backdrop, GtkCalendar.button:backdrop:hover {
-      color: #252727;
-      background-image: none; }
+      color: #7a7b7a; }
 
 /***********
  * Dialogs *
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 161be731c4..8a73f3a2be 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -435,7 +435,7 @@
     border-radius: 3px;
     border-style: solid; }
 
-.button:link, .button:visited, .button:link:hover, .button:link:active, .button:visited:hover, .button:visited:active, .button:link:backdrop, .button:visited:backdrop, .notebook tab .button {
+.button:link, .button:visited, .button:link:hover, .button:link:active, .button:visited:hover, .button:visited:active, .button:link:backdrop, .button:visited:backdrop, .notebook tab .button, GtkCalendar.button, GtkCalendar.button:hover, GtkCalendar.button:backdrop, GtkCalendar.button:backdrop:hover {
   border-color: transparent;
   background-color: transparent;
   background-image: none;
@@ -2194,15 +2194,11 @@ GtkCalendar {
   border: 1px solid #a1a1a1; }
   GtkCalendar.button {
     padding: 0 4px;
-    color: #d0d0d0;
-    background-image: none;
-    background-color: transparent; }
+    color: #abadae; }
     GtkCalendar.button:hover {
-      background-image: none;
       color: #2e3436; }
     GtkCalendar.button:backdrop, GtkCalendar.button:backdrop:hover {
-      color: #d2d2d2;
-      background-image: none; }
+      color: #a8aaab; }
 
 /***********
  * Dialogs *