diff --git a/src/sass/gnome-shell/common/_calendar.scss b/src/sass/gnome-shell/common/_calendar.scss
index 1aba4f5..cad7f86 100644
--- a/src/sass/gnome-shell/common/_calendar.scss
+++ b/src/sass/gnome-shell/common/_calendar.scss
@@ -117,12 +117,12 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
 /* Calendar */
 .calendar {
   border: none;
-  box-shadow: 0 1px 2px rgba(black, 0.02) !important;
-  background-color: $popover_bubble_bg;
-  padding: $base_padding * 2 !important;
-  margin: 0 $base_padding + $base_margin + 4px !important;
+  box-shadow: none !important;
+  background-color: transparent;
+  padding: $base_padding !important;
+  margin: 0 4px !important;
   text-shadow: none;
-  border-radius: $mn_radius;
+  // border-radius: $base_border_radius;
 
   // month
   .calendar-month-label {
@@ -188,11 +188,11 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
     }
 
     &.calendar-day-heading {  //day of week heading
-      width: $menuitem_size;
-      height: $menuitem_size - 7px;
-      margin-top: 2px;
-      padding: 7px 0 0;
-      border-radius: $circular_radius;
+      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);
diff --git a/src/sass/gnome-shell/common/_quick-settings.scss b/src/sass/gnome-shell/common/_quick-settings.scss
index 919e525..29a9bf7 100644
--- a/src/sass/gnome-shell/common/_quick-settings.scss
+++ b/src/sass/gnome-shell/common/_quick-settings.scss
@@ -68,7 +68,7 @@
 
   .quick-toggle-arrow {
     background-color: $fill_color !important;
-    padding: $base_padding $base_padding * 1.75;
+    padding: 0 $base_padding * 2.5;
 
     &:active {
       background-color: $divider_color !important;
@@ -115,7 +115,7 @@
   background-color: $menu_bg !important;
   color: $text_color !important;
   border-radius: $base_border_radius * 3;
-  padding: $base_padding * 2;
+  padding: $base_padding * 3;
   margin: $base_padding * 2 $base_padding * 6 0;
 
   .popup-menu-item {
@@ -131,14 +131,14 @@
   }
 
   & .header {
-    spacing-rows: 0.5 * $base_padding;
-    spacing-columns: $base_padding * 2;
-    padding-bottom: 2 * $base_padding;
+    spacing-rows: 0.5 * $container_padding;
+    spacing-columns: $container_padding * 2;
+    padding-bottom: 2 * $container_padding;
 
     & .icon {
       icon-size: $base_icon_size * 1.5; // a non-standard symbolic size but ok
       border-radius: $circular_radius;
-      padding: 1.5 * $base_padding;
+      padding: 1.5 * $container_padding;
       background-color: $divider_color !important;
 
       &.active {
@@ -146,6 +146,14 @@
         color: $light_fg_color;
       }
     }
+
+    & .title {
+      @include font(title);
+    }
+
+    & .subtitle {
+      @include font(body-1);
+    }
   }
 }
 
@@ -156,8 +164,8 @@
     background-color: $fill_color;
     color: $text_color;
     border-radius: $circular_radius;
-    min-height: 24px !important;
-    min-width: 24px !important;
+    min-height: $menuitem_size !important;
+    min-width: $menuitem_size !important;
     // padding: $container_padding;
 
     &:hover { @include button(flat-hover); }