diff --git a/biscuit/apps/chronos/templates/timetable/latex/hints.tex b/biscuit/apps/chronos/templates/timetable/latex/hints.tex
index 7fc99548ea406d1aa500dbdad485b32cbe2a4323..dcf77041f49e612f5a708bfafbf7cbe1c8fae801 100644
--- a/biscuit/apps/chronos/templates/timetable/latex/hints.tex
+++ b/biscuit/apps/chronos/templates/timetable/latex/hints.tex
@@ -1,6 +1,6 @@
 {% load martortags %}
 {% if hints %}
-\subsection*{Hinweise}
+\subsection*{\hspace{0.7em}Hinweise}
 \vspace{-0.7em}
 \begin{itemize}
     \setlength\itemsep{0.1em}
@@ -12,5 +12,4 @@
 {{ hint.text_as_latex|safe }}
 {% endfor %}
 \end{itemize}
-\vspace{-1em}
 {% endif %}
\ No newline at end of file
diff --git a/biscuit/apps/chronos/templates/timetable/latex/substitutions.tex b/biscuit/apps/chronos/templates/timetable/latex/substitutions.tex
index 718204bf1e9b03a4f4503f4f674d9b71a19ef652..05c7a1aef7388eeafe1486ba2f49451bf2fbf383 100644
--- a/biscuit/apps/chronos/templates/timetable/latex/substitutions.tex
+++ b/biscuit/apps/chronos/templates/timetable/latex/substitutions.tex
@@ -24,8 +24,8 @@
 
 % Badge box
 \usepackage{tcolorbox}
-\newtcbox{\badge}{nobeforeafter,colframe=green,colback=green,boxrule=0pt,arc=4pt,
-boxsep=0pt,left=4pt,right=4pt,top=1pt,bottom=1pt,tcbox raise base,
+\newtcbox{\badge}{nobeforeafter,colframe=green,colback=green,boxrule=0pt,arc=2pt,
+boxsep=0pt,left=4pt,right=4pt,top=2pt,bottom=3pt,tcbox raise base,
 grow to left by=0pt,
 grow to right by=-3pt,
 enlarge top by=1pt,
@@ -64,7 +64,7 @@ Stand: {% now "j. F Y H:i" %}\\
     {%  include "timetable/latex/hints.tex" %}
 
     {% if header_info.is_box_needed %}
-    \begin{tabular}{p{0.22\linewidth}p{0.73\linewidth}}
+    \begin{tabular}{@{\hspace{-1em}}p{0.22\linewidth}p{0.73\linewidth}}
     {% for row in header_info.rows %}
         \textbf{ {{ row.0 }} } & {{ row.1 }} \\
     {% endfor %}
@@ -75,8 +75,8 @@ Stand: {% now "j. F Y H:i" %}\\
     {% set color_background = 1 %}
     {% set last_classes = "" %}
 
-    \def\arraystretch{1.0}
-    \begin{longtable}{p{20mm}p{8mm}p{32mm}p{25mm}p{30mm}p{45mm}}
+    \def\arraystretch{1.1}
+    \begin{longtable}{p{20mm}p{10mm}p{30mm}p{25mm}p{30mm}p{45mm}}
         \textbf{Klassen} &
         \textbf{Std.} &
         \textbf{Lehrer} &