diff --git a/data/theme/gtk-styles.css b/data/theme/gtk-styles.css
index 8ca9ce30..7fc5f111 100644
--- a/data/theme/gtk-styles.css
+++ b/data/theme/gtk-styles.css
@@ -29,10 +29,7 @@ calendar-view.header {
 }
 
 calendar-view.current {
-    background-color: black;
-    border-radius: 2px;
-    color: white;
-    font-weight: bold;
+    background-color: alpha(@theme_selected_bg_color, 0.3);
 }
 
 calendar-view.current:drop(active) {
diff --git a/src/gcal-month-view.c b/src/gcal-month-view.c
index 64b43365..9896802b 100644
--- a/src/gcal-month-view.c
+++ b/src/gcal-month-view.c
@@ -1789,9 +1789,9 @@ gcal_month_view_draw (GtkWidget *widget,
 
           /* FIXME: hardcoded padding of the number background */
           gtk_render_background (context, cr,
-                                 cell_width * (column + 1 - priv->k) - sw * padding.right + (priv->k - 1) * font_width - 2.0,
-                                 cell_height * (row + 1 + first_row_gap) - font_height - padding.bottom + start_grid_y,
-                                 font_width + 4, font_height + 2);
+                                 cell_width * (column - priv->k),
+                                 cell_height * (row + first_row_gap) + start_grid_y,
+                                 cell_width, cell_height);
           gtk_render_layout (context, cr,
                              cell_width * (column + 1 - priv->k) - sw * padding.right + (priv->k - 1) * font_width,
                              cell_height * (row + 1 + first_row_gap) - font_height - padding.bottom + start_grid_y,