diff --git a/data/theme/gtk-styles.css b/data/theme/gtk-styles.css
index be07bc8d..47412f19 100644
--- a/data/theme/gtk-styles.css
+++ b/data/theme/gtk-styles.css
@@ -107,8 +107,8 @@ calendar-view.second-view-header {
     font-size: 70%;
     font-weight: bold;
     border-radius: 2px;
-    background-color: alpha(@theme_fg_color, 0.55);
-    color: @theme_bg_color;
+    background-color: alpha(@theme_fg_color, 0.05);
+    color: alpha(@theme_fg_color, 0.4);
 }
 
 /* these two are supposed be changed in sync with .calendar-view */
diff --git a/src/gcal-year-view.c b/src/gcal-year-view.c
index 994a2e07..0b7ed9bf 100644
--- a/src/gcal-year-view.c
+++ b/src/gcal-year-view.c
@@ -29,7 +29,7 @@
 #define NAVIGATOR_CELL_HEIGHT 210
 #define SIDEBAR_PREFERRED_WIDTH 200
 #define VISUAL_CLUES_SIDE 3.0
-#define WEEK_NUMBER_PADDING 3.0
+#define WEEK_NUMBER_MARGIN 3.0
 
 typedef struct
 {
@@ -848,9 +848,9 @@ draw_month_grid (GcalYearView *year_view,
       box_padding_start = (box_side - layout_width) / 2.0 > 0 ? (box_side - layout_width) / 2.0 : 0;
 
       gtk_render_background (context, cr,
-                             x + sw * WEEK_NUMBER_PADDING + year_view->k * (7 * box_side + WEEK_NUMBER_PADDING * 2),
-                             box_side * (i + 1) + y + WEEK_NUMBER_PADDING,
-                             box_side - WEEK_NUMBER_PADDING * 2, box_side - WEEK_NUMBER_PADDING * 2);
+                             x + sw * box_padding_top + year_view->k * (8 * box_side - layout_height) - WEEK_NUMBER_MARGIN,
+                             box_side * (i + 1) + y + box_padding_top - WEEK_NUMBER_MARGIN,
+                             layout_height + WEEK_NUMBER_MARGIN * 2, layout_height + WEEK_NUMBER_MARGIN * 2);
 
       gtk_render_layout (context, cr,
                          x + sw * box_padding_start + year_view->k * (8 * box_side - layout_width),