diff --git a/system/home/desktop/waybar.nix b/system/home/desktop/waybar.nix
index c4d7fae4..26740e42 100644
--- a/system/home/desktop/waybar.nix
+++ b/system/home/desktop/waybar.nix
@@ -172,32 +172,34 @@
         tooltip-format = "{status} | {device_alias}";
         on-click = "${pkgs.blueman}/bin/blueman-manager";
       };
-      "clock#calendar" = {
-        format = "󰃭 {:%Y-%m-%d}";
-        tooltip-format = "<tt><small>{calendar}</small></tt>";
-        calendar = {
-          mode = "year";
-          mode-mon-col = 3;
-          weeks-pos = "left";
-          on-scroll = 1;
-          format =
-            let
-              scheme = config.lib.stylix.scheme.withHashtag;
-            in
-            {
-              months = "<span color='${scheme.red}'><b>{}</b></span>";
-              weeks = "<span color='${scheme.cyan}'><b>W{}</b></span>";
-              weekdays = "<span color='${scheme.orange}'><b>{}</b></span>";
-              days = "<span color='${scheme.base05}'><b>{}</b></span>";
-              today = "<span color='${scheme.magenta}'><b><i>{}</i></b></span>";
-            };
+      "clock#calendar" =
+        let
+          size = "${toString config.stylix.fonts.sizes.popups}pt";
+        in
+        {
+          format = "󰃭 {:%Y-%m-%d}";
+          tooltip-format = "<span size='${size}'>{calendar}</span>";
+          calendar = {
+            mode = "month";
+            weeks-pos = "left";
+            on-scroll = 1;
+            format =
+              let
+                scheme = config.lib.stylix.scheme.withHashtag;
+              in
+              {
+                months = "<span color='${scheme.red}'><b>{}</b></span>";
+                weeks = "<span color='${scheme.cyan}'><i>W{}</i></span>";
+                weekdays = "<span color='${scheme.orange}'><u>{}</u></span>";
+                days = "<span color='${scheme.base05}'>{}</span>";
+                today = "<span color='${scheme.magenta}'><b><u>{}</u></b></span>";
+              };
+          };
+          actions = {
+            on-scroll-up = "shift_up";
+            on-scroll-down = "shift_down";
+          };
         };
-        actions = {
-          on-click-right = "mode";
-          on-scroll-up = "shift_up";
-          on-scroll-down = "shift_down";
-        };
-      };
       clock.format = "󰥔 {:%R}";
       backlight = {
         format = "{icon}";