diff --git a/src/sass/gnome-shell/common/_calendar.scss b/src/sass/gnome-shell/common/_calendar.scss
index e91fedf4..76bd2e0a 100644
--- a/src/sass/gnome-shell/common/_calendar.scss
+++ b/src/sass/gnome-shell/common/_calendar.scss
@@ -138,10 +138,10 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
     @extend %numeric;
     // @extend %smaller;
     text-align: center;
-    width: 2.2em !important;
-    height: 2.2em !important;
-    padding: 2px !important;
-    margin: 2px !important;
+    width: if($font_size == 'normal', 2.8em, 2.4em) !important;
+    height: if($font_size == 'normal', 2.8em, 2.4em) !important;
+    padding: 0;
+    margin: 2px;
     border-radius: $circular_radius;
     color: $alt_fg_color;
     font-feature-settings: "tnum";
@@ -238,10 +238,10 @@ $popover_bubble_bg: if($variant == 'light', rgba(white, 0.95), rgba(lighten($bas
 
   .calendar-week-number {
     @extend %smaller;
-    width: 2em !important;
-    height: 2em !important;
-    margin: 0.6em 0.6em 0.6em 0.2em !important;
-    padding: 0 0.3em !important;
+    width: 2.4em !important;
+    height: 2.4em !important;
+    margin: 6px !important;
+    padding: 0 !important;
     border-radius: $bt_radius;
     background-color: if($variant == 'light', rgba(black, 0.05), rgba(white, 0.05));
     color: $hint_fg_color;