diff --git a/src/public/app/widgets/buttons/calendar.ts b/src/public/app/widgets/buttons/calendar.ts
index 9781b3fa6..b3275a086 100644
--- a/src/public/app/widgets/buttons/calendar.ts
+++ b/src/public/app/widgets/buttons/calendar.ts
@@ -287,8 +287,8 @@ export default class CalendarWidget extends RightDropdownButtonWidget {
     }
 
     createWeekNumber(weekNumber: number) {
-        const weekNumberText = 'W' + String(weekNumber).padStart(2, '0');
-        const $newWeekNumber = $("<a>").addClass("calendar-date calendar-week-number").attr("data-calendar-week-number", weekNumberText);
+        const weekNumberText = String(weekNumber);
+        const $newWeekNumber = $("<a>").addClass("calendar-date calendar-week-number").attr("data-calendar-week-number", 'W' + weekNumberText.padStart(2, '0'));
         const $weekNumber = $("<span>").html(weekNumberText);
 
         $newWeekNumber.append($weekNumber);
diff --git a/src/public/stylesheets/calendar.css b/src/public/stylesheets/calendar.css
index a1745d737..66749ed0f 100644
--- a/src/public/stylesheets/calendar.css
+++ b/src/public/stylesheets/calendar.css
@@ -94,6 +94,7 @@
 }
 
 .calendar-dropdown-widget .calendar-week-number {
+    color: var(--muted-text-color) !important;
     position: relative;
 }
 
diff --git a/src/public/stylesheets/theme-next/shell.css b/src/public/stylesheets/theme-next/shell.css
index 5552e482d..47792f24d 100644
--- a/src/public/stylesheets/theme-next/shell.css
+++ b/src/public/stylesheets/theme-next/shell.css
@@ -317,7 +317,6 @@ body.layout-horizontal > .horizontal {
 }
 
 .calendar-dropdown-widget .calendar-header {
-    padding: 8px 0 20px 0;
     gap: 10px;
 }