diff --git a/data/gtk-styles.css b/data/gtk-styles.css
index d165a8bd..9441882b 100644
--- a/data/gtk-styles.css
+++ b/data/gtk-styles.css
@@ -19,6 +19,15 @@
   margin: 0;
 }
 
+.main-toolbar {
+  padding-top: 12px;
+  padding-bottom: 12px;
+}
+
+.main-toolbar .button {
+  padding: 2px;
+}
+
 .sources-views {
   padding: 12px;
   border-radius: 0;
@@ -40,10 +49,11 @@
 
 .calendar-view header {
   font: bold 12;
-  background-color: @theme_bg_color;
 }
 
 .calendar-view {
+  background-color: #F6F6F6;
+
   padding: 6px;
   font: 10;
 }
diff --git a/src/gcal-month-view.c b/src/gcal-month-view.c
index 0fda484d..f66d2cdc 100644
--- a/src/gcal-month-view.c
+++ b/src/gcal-month-view.c
@@ -454,6 +454,8 @@ gcal_month_view_draw (GtkWidget *widget,
   gtk_style_context_get_padding (context, state, &padding);
   gtk_widget_get_allocation (widget, &alloc);
 
+  gtk_render_background (context, cr, alloc.x, alloc.y, alloc.width, alloc.height);
+
   gcal_month_view_draw_header (GCAL_MONTH_VIEW (widget), cr, &alloc, &padding);
   gcal_month_view_draw_grid (GCAL_MONTH_VIEW (widget), cr, &alloc, &padding);
 
diff --git a/src/gcal-toolbar.c b/src/gcal-toolbar.c
index b26fae03..71a503ca 100644
--- a/src/gcal-toolbar.c
+++ b/src/gcal-toolbar.c
@@ -183,7 +183,7 @@ gcal_toolbar_constructed (GObject *object)
                              GTK_ICON_SIZE_BUTTON);
 
   context = gtk_widget_get_style_context (priv->widget);
-  gtk_style_context_add_class (context, "gcal-main-toolbar");
+  gtk_style_context_add_class (context, "main-toolbar");
 
   /* adding toolbar */
   bin = gtk_clutter_actor_get_widget (GTK_CLUTTER_ACTOR (object));
diff --git a/src/gcal-week-view.c b/src/gcal-week-view.c
index 75d9f943..fb87e469 100644
--- a/src/gcal-week-view.c
+++ b/src/gcal-week-view.c
@@ -876,12 +876,6 @@ gcal_week_view_draw_header (GcalWeekView  *view,
   context = gtk_widget_get_style_context (widget);
   state = gtk_widget_get_state_flags (widget);
 
-  gtk_style_context_save (context);
-  gtk_style_context_add_region (context, "header", 0);
-
-  gtk_render_background (context, cr,
-                         alloc->x, alloc->y,
-                         alloc->width, start_grid_y);
   /* adding shadow */
   pattern = cairo_pattern_create_linear(0, start_grid_y - 18, 0, start_grid_y + 6);
 
@@ -894,6 +888,9 @@ gcal_week_view_draw_header (GcalWeekView  *view,
   cairo_rectangle(cr, 0, start_grid_y, alloc->width, 6);
   cairo_fill(cr);
 
+  gtk_style_context_save (context);
+  gtk_style_context_add_region (context, "header", 0);
+
   gtk_style_context_get_color (context, state, &color);
   cairo_set_source_rgb (cr, color.red, color.green, color.blue);