diff --git a/aleksis/apps/chronos/templates/chronos/partials/subject.html b/aleksis/apps/chronos/templates/chronos/partials/subject.html
index c6f305ab0ed98a144e7a514b356dd42b447fad50..efed11727cb1b824f238d0e33d08cd2036f60837 100644
--- a/aleksis/apps/chronos/templates/chronos/partials/subject.html
+++ b/aleksis/apps/chronos/templates/chronos/partials/subject.html
@@ -1,3 +1 @@
-<strong>
-  {{ subject.short_name|default:subject.name }}
-</strong>
+{{ subject.short_name|default:subject.name }}
diff --git a/aleksis/apps/chronos/templates/chronos/partials/subs/groups.html b/aleksis/apps/chronos/templates/chronos/partials/subs/groups.html
index 079e0f03f860996f26f4b1688d309790bae10c21..447054384f19929af4872de104df01401254be2a 100644
--- a/aleksis/apps/chronos/templates/chronos/partials/subs/groups.html
+++ b/aleksis/apps/chronos/templates/chronos/partials/subs/groups.html
@@ -1,13 +1,9 @@
 {% if el.cancelled and el.amends.groups.all %}
   {% include "chronos/partials/groups.html" with groups=el.amends.groups.all %}
 {% elif el.groups.all and el.amends.groups.all %}
-  <s>
-    {% include "chronos/partials/groups.html" with groups=el.amends.groups.all %}
-  </s>
-  →
-  <strong>
-    {% include "chronos/partials/groups.html" with groups=el.groups.all %}
-  </strong>
+  <s>{% include "chronos/partials/groups.html" with groups=el.amends.groups.all %}</s>
+  &nbsp;→&nbsp;
+  <strong>{% include "chronos/partials/groups.html" with groups=el.groups.all %}</strong>
 {% elif el.groups.all and not el.amends.groups.all %}
   {% include "chronos/partials/groups.html" with groups=el.groups.all %}
 {% elif el.amends.groups.all %}
diff --git a/aleksis/apps/chronos/templates/chronos/partials/subs/period.html b/aleksis/apps/chronos/templates/chronos/partials/subs/period.html
index 874631a72c99a7f128b07bc2fed71265d8349a56..c2af91a11072997fe8fb05575308aad359cbb702 100644
--- a/aleksis/apps/chronos/templates/chronos/partials/subs/period.html
+++ b/aleksis/apps/chronos/templates/chronos/partials/subs/period.html
@@ -7,7 +7,7 @@
       {{ el.REFERENCE_OBJECT.slot_number_start }}.–{{ el.REFERENCE_OBJECT.slot_number_end }}.
     {% endif %}
   {% elif el.DTSTART.dt.time %}
-    {{ el.DTSTART.dt.time }} - {{ el.DTSTART.dt.time }}
+    {{ el.DTSTART.dt.time }}–{{ el.DTSTART.dt.time }}
   {% else %}
     {% trans "all day" %}
   {% endif %}
diff --git a/aleksis/apps/chronos/templates/chronos/partials/subs/room.html b/aleksis/apps/chronos/templates/chronos/partials/subs/room.html
deleted file mode 100644
index 123faba6f8208bf57d31a44056a7b5cbd4bbb14e..0000000000000000000000000000000000000000
--- a/aleksis/apps/chronos/templates/chronos/partials/subs/room.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% if el.cancelled and el.amends.rooms.all %}
-  {% include "chronos/partials/rooms.html" with rooms=el.amends.rooms.all %}
-{% elif el.rooms.all and el.amends.rooms.all %}
-  <s>
-    {% include "chronos/partials/rooms.html" with rooms=el.amends.rooms.all %}
-  </s>
-  →
-  <strong>
-    {% include "chronos/partials/rooms.html" with rooms=el.rooms.all %}
-  </strong>
-{% elif el.rooms.all and not el.amends.rooms.all %}
-  {% include "chronos/partials/rooms.html" with rooms=el.rooms.all %}
-{% elif el.amends.rooms.all %}
-  {% include "chronos/partials/rooms.html" with rooms=el.amends.rooms.all %}
-{% endif %}
diff --git a/aleksis/apps/chronos/templates/chronos/partials/subs/rooms.html b/aleksis/apps/chronos/templates/chronos/partials/subs/rooms.html
index 123faba6f8208bf57d31a44056a7b5cbd4bbb14e..6a1ad0dedf556584323a97c9d4168497af81af35 100644
--- a/aleksis/apps/chronos/templates/chronos/partials/subs/rooms.html
+++ b/aleksis/apps/chronos/templates/chronos/partials/subs/rooms.html
@@ -1,13 +1,9 @@
 {% if el.cancelled and el.amends.rooms.all %}
   {% include "chronos/partials/rooms.html" with rooms=el.amends.rooms.all %}
 {% elif el.rooms.all and el.amends.rooms.all %}
-  <s>
-    {% include "chronos/partials/rooms.html" with rooms=el.amends.rooms.all %}
-  </s>
-  →
-  <strong>
-    {% include "chronos/partials/rooms.html" with rooms=el.rooms.all %}
-  </strong>
+  <s>{% include "chronos/partials/rooms.html" with rooms=el.amends.rooms.all %}</s>
+  &nbsp;→&nbsp;
+  <strong>{% include "chronos/partials/rooms.html" with rooms=el.rooms.all %}</strong>
 {% elif el.rooms.all and not el.amends.rooms.all %}
   {% include "chronos/partials/rooms.html" with rooms=el.rooms.all %}
 {% elif el.amends.rooms.all %}
diff --git a/aleksis/apps/chronos/templates/chronos/partials/subs/subject.html b/aleksis/apps/chronos/templates/chronos/partials/subs/subject.html
index 3e907e1f082aefb0a3795ea230ba63e0210ab4d3..eaa70ff734c9337835830665ec57cb232b155c8b 100644
--- a/aleksis/apps/chronos/templates/chronos/partials/subs/subject.html
+++ b/aleksis/apps/chronos/templates/chronos/partials/subs/subject.html
@@ -11,7 +11,7 @@
   <s>{% include "chronos/partials/subject.html" with subject=el.amends.subject %}</s>
 {% elif el.subject and el.amends.subject %}
   <s>{% include "chronos/partials/subject.html" with subject=el.amends.subject %}</s>
-  →
+  &nbsp;→&nbsp;
   <strong>{% include "chronos/partials/subject.html" with subject=el.subject %}</strong>
 {% elif el.subject and not el.amends.subject %}
   {% include "chronos/partials/subject.html" with subject=el.subject %}