diff --git a/blocks/calendar_month/block_calendar_month.php b/blocks/calendar_month/block_calendar_month.php
index b578d4d4c5c..2e395ce0263 100644
--- a/blocks/calendar_month/block_calendar_month.php
+++ b/blocks/calendar_month/block_calendar_month.php
@@ -50,7 +50,7 @@ class block_calendar_month extends block_base {
             $this->content->text .= calendar_top_controls('course', array('id' => $courseid, 'm' => $cal_m, 'y' => $cal_y));
             $this->content->text .= calendar_get_mini($courses, $group, $user, $cal_m, $cal_y);
             $this->content->text .= '<h3 class="eventskey">'.get_string('eventskey', 'calendar').'</h3>';
-            $this->content->text .= '<div class="filters">'.calendar_filter_controls($this->page->url).'</div>';
+            $this->content->text .= '<div class="filters calendar_filters">'.calendar_filter_controls($this->page->url).'</div>';
         }
 
         return $this->content;
diff --git a/theme/afterburner/style/afterburner_calendar.css b/theme/afterburner/style/afterburner_calendar.css
index 969b9892ea7..dae4a5fce8f 100644
--- a/theme/afterburner/style/afterburner_calendar.css
+++ b/theme/afterburner/style/afterburner_calendar.css
@@ -133,32 +133,36 @@ Modules: Calendar
 .block .content h3.eventskey {
     margin-top:0.5em;
     margin-bottom:0;
-    margin-left:0.5em;
 }
+.block .calendar_filters li { padding: 0; }
 /*
 Colors for Calendar Events
 -----------------------*/
 #calendar .event_global,
 .minicalendar .event_global,
-.block_calendar_month .event_global {
+.block_calendar_month .event_global,
+.calendar_event_global {
     border-color:#def2ba !important;
     background-color:#def2ba;
 }
 #calendar .event_course,
 .minicalendar .event_course,
-.block_calendar_month .event_course {
+.block_calendar_month .event_course,
+.calendar_event_course {
     border-color:#c6dfeb !important;
     background-color:#c6dfeb;
 }
 #calendar .event_group,
 .minicalendar .event_group,
-.block_calendar_month .event_group {
+.block_calendar_month .event_group,
+.calendar_event_group {
     border-color:#feffc2 !important;
     background-color:#feffc2;
 }
 #calendar .event_user,
 .minicalendar .event_user,
-.block_calendar_month .event_user {
+.block_calendar_month .event_user,
+.calendar_event_user {
     border-color:#d9c6e2 !important;
     background-color:#d9c6e2;
 }
diff --git a/theme/base/style/calendar.css b/theme/base/style/calendar.css
index 5f7a6c85a6b..40efe705928 100644
--- a/theme/base/style/calendar.css
+++ b/theme/base/style/calendar.css
@@ -48,4 +48,4 @@
 .block .calendar_filters li { margin-bottom: .2em;}
 .block .calendar_filters li span img { padding: 0 .2em;}
 .block .calendar_filters .eventname { padding-left: .2em;}
-.block .content h3.eventskey {margin-top:0.5em;margin-bottom:0;margin-left:0.5em;}
\ No newline at end of file
+.block .content h3.eventskey {margin-top:0.5em;}
\ No newline at end of file