diff --git a/src/pretix/presale/templates/pretixpresale/fragment_calendar.html b/src/pretix/presale/templates/pretixpresale/fragment_calendar.html
index c407e5615..a7a8683d9 100644
--- a/src/pretix/presale/templates/pretixpresale/fragment_calendar.html
+++ b/src/pretix/presale/templates/pretixpresale/fragment_calendar.html
@@ -55,16 +55,10 @@
                                             {% if event.time %}
                                                 <span class="event-time" data-time="{{ event.event.date_from.isoformat }}" data-timezone="{{ event.timezone }}" data-time-short>
                                                     <span class="fa fa-clock-o" aria-hidden="true"></span>
-                                                    {% if not show_names|default_if_none:True %}
-                                                        <strong>
-                                                    {% endif %}
                                                     <time datetime="{{ event.time|date_fast:"H:i" }}">{{ event.time|date_fast:"TIME_FORMAT" }}</time>
                                                     {% if event.event.settings.show_date_to and event.time_end %}
                                                         <span aria-hidden="true">–</span><span class="sr-only">{% trans "until" context "timerange" %}</span> <time datetime="{{ event.time_end|date_fast:"H:i" }}">{{ event.time_end|date_fast:"TIME_FORMAT" }}</time>
                                                     {% endif %}
-                                                    {% if not show_names|default_if_none:True %}
-                                                        </strong>
-                                                    {% endif %}
                                                     {% if multiple_timezones %}
                                                         {{ event.timezone }}
                                                     {% endif %}
@@ -77,18 +71,18 @@
                                                     {% elif event.event.settings.waiting_list_enabled and event.event.best_availability_state >= 0 %}
                                                         <span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Waiting list" %}
                                                     {% elif event.event.best_availability_state == 20 %}
-                                                        <span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Reserved" %}
+                                                        {% trans "Reserved" %}
                                                     {% elif event.event.best_availability_state < 20 %}
                                                         {% if event.event.has_paid_item %}
-                                                            <span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Sold out" %}
+                                                            {% trans "Sold out" %}
                                                         {% else %}
-                                                            <span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Fully booked" %}
+                                                            {% trans "Fully booked" %}
                                                         {% endif %}
                                                     {% endif %}
                                                 {% elif event.event.presale_is_running %}
                                                     <span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Book now" %}
                                                 {% elif event.event.presale_has_ended %}
-                                                    <span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Sale over" %}
+                                                    {% trans "Sale over" %}
                                                 {% elif event.event.settings.presale_start_show_date and event.event.presale_start %}
                                                     <span class="fa fa-ticket" aria-hidden="true"></span>
                                                     {% with date_human=event.event.presale_start|date_fast:"SHORT_DATE_FORMAT" date_iso=event.event.presale_start|date_fast:"c"  %}
diff --git a/src/pretix/presale/templates/pretixpresale/fragment_week_calendar.html b/src/pretix/presale/templates/pretixpresale/fragment_week_calendar.html
index f1b73edb6..a2ecac02e 100644
--- a/src/pretix/presale/templates/pretixpresale/fragment_week_calendar.html
+++ b/src/pretix/presale/templates/pretixpresale/fragment_week_calendar.html
@@ -40,16 +40,10 @@
                             {% if event.time %}
                                 <span class="event-time" data-time="{{ event.event.date_from.isoformat }}" data-timezone="{{ event.timezone }}" data-time-short>
                                     <span class="fa fa-clock-o" aria-hidden="true"></span>
-                                    {% if not show_names|default_if_none:True %}
-                                        <strong>
-                                    {% endif %}
                                     <time datetime="{{ event.time|date_fast:"H:i" }}">{{ event.time|date_fast:"TIME_FORMAT" }}</time>
                                     {% if event.time_end %}
                                         <span aria-hidden="true">–</span><span class="sr-only">{% trans "until" context "timerange" %}</span> <time datetime="{{ event.time_end|date_fast:"H:i" }}">{{ event.time_end|date_fast:"TIME_FORMAT" }}</time>
                                     {% endif %}
-                                    {% if not show_names|default_if_none:True %}
-                                        </strong>
-                                    {% endif %}
                                     {% if multiple_timezones %}
                                         {{ event.timezone }}
                                     {% endif %}
@@ -62,18 +56,18 @@
                                     {% elif event.event.settings.waiting_list_enabled and event.event.best_availability_state >= 0 %}
                                         <span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Waiting list" %}
                                     {% elif event.event.best_availability_state == 20 %}
-                                        <span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Reserved" %}
+                                        {% trans "Reserved" %}
                                     {% elif event.event.best_availability_state < 20 %}
                                         {% if event.event.has_paid_item %}
-                                            <span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Sold out" %}
+                                            {% trans "Sold out" %}
                                         {% else %}
-                                            <span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Fully booked" %}
+                                            {% trans "Fully booked" %}
                                         {% endif %}
                                     {% endif %}
                                 {% elif event.event.presale_is_running %}
                                     <span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Book now" %}
                                 {% elif event.event.presale_has_ended %}
-                                    <span class="fa fa-ticket" aria-hidden="true"></span> {% trans "Sale over" %}
+                                    {% trans "Sale over" %}
                                 {% elif event.event.settings.presale_start_show_date and event.event.presale_start %}
                                     <span class="fa fa-ticket" aria-hidden="true"></span>
                                     {% blocktrans with start_date=event.event.presale_start|date_fast:"SHORT_DATE_FORMAT" %}
diff --git a/src/pretix/static/pretixpresale/scss/_calendar.scss b/src/pretix/static/pretixpresale/scss/_calendar.scss
index 66b8c4623..4319be218 100644
--- a/src/pretix/static/pretixpresale/scss/_calendar.scss
+++ b/src/pretix/static/pretixpresale/scss/_calendar.scss
@@ -37,13 +37,13 @@
     }
 
     &.continued, &.over {
-      background: lighten(#767676, 48%);
-      border-color: lighten(#767676, 30%);
-      border-left-color: lighten(#767676, 30%);
+      background: lighten(#767676, 54%);
+      border-color: lighten(#767676, 44%);
+      border-left-color: lighten(#767676, 44%);
       color: #767676;
       &:hover {
-        background: lighten(#767676, 50%);
-        border-color: lighten(#767676, 25%);
+        background: lighten(#767676, 54%);
+        border-color: lighten(#767676, 40%);
       }
     }
 
@@ -82,8 +82,19 @@
       }
     }
 
-    .event-name {
+
+    &.available > *:first-child,
+    &.continued > *:first-child,
+    &.soon > *:first-child {
       font-weight: bold;
+    }
+    &.over > *:first-child,
+    &.reserved > *:first-child,
+    &.soldout > *:first-child {
+      text-decoration: line-through
+    }
+
+    .event-name {
       display: block;
     }
     .event-time, .event-status {