diff --git a/assets/sass/textHighlight.scss b/assets/sass/textHighlight.scss
index f5c57a94..f35b1c57 100644
--- a/assets/sass/textHighlight.scss
+++ b/assets/sass/textHighlight.scss
@@ -6,6 +6,14 @@
   border-left: var(--bg-neutral) solid 1rem;
 }
 
+.m-text-highlight__roofline {
+  font-size: 1.4rem;
+  margin-bottom: 1rem;
+  text-transform: uppercase;
+  font-weight: bold;
+  opacity: .8;
+}
+
 .m-text-highlight--tip {
   background-color: #C4F2FF;
   border-left: #1DB5DF solid 1rem;
diff --git a/i18n/de.yaml b/i18n/de.yaml
index 33a29da5..d8c66f2c 100644
--- a/i18n/de.yaml
+++ b/i18n/de.yaml
@@ -11,9 +11,10 @@ menu-open: Menü
 menu-close: Schließen
 general: Übergreifendes
 information-disclaimer-short: Diese Informationen sind inoffiziell und ohne Gewähr. Es besteht keine rechtliche Verbindung zu FIP oder Bahngesellschaften.
-highlight-important: Wichtige Information
-highlight-inofficial: Inoffizielle Information
-highlight-tip: Persönlicher Tipp
+highlight:
+  important: Wichtige Information
+  inofficial: Inoffizielle Information
+  tip: Persönlicher Tipp
 news-headline: Was gibt's Neues?
 _operator__list_title: Betreiber mit FIP
 updateDate: Zuletzt aktualisiert
diff --git a/i18n/en.yaml b/i18n/en.yaml
index 8c58f9f2..0bd05a4e 100644
--- a/i18n/en.yaml
+++ b/i18n/en.yaml
@@ -11,9 +11,10 @@ menu-open: Menu
 menu-close: Close
 general: general
 information-disclaimer-short: The information provided is unofficial and without guarantee. There is no legal connection to FIP or railway companies.
-highlight-important: Important Information
-highlight-inofficial: Unofficial Information
-highlight-tip: Personal Tip
+highlight:
+  important: Important Information
+  inofficial: Unofficial Information
+  tip: Personal Tip
 news-headline: What's new?
 _operator__list_title: Operators supporting FIP
 updateDate: Last updated
diff --git a/layouts/shortcodes/highlight.html b/layouts/shortcodes/highlight.html
index ca53f3d8..76e211e2 100644
--- a/layouts/shortcodes/highlight.html
+++ b/layouts/shortcodes/highlight.html
@@ -1,3 +1,8 @@
-<div class="m-text-highlight m-text-highlight--{{ (.Get 0) | markdownify }}" aria-label='{{ T (printf "highlight-%s" (.Get 0)) }}'>
-    {{ .Inner }}
-</div>
+{{- $param := .Get 0 -}}
+<div class="m-text-highlight m-text-highlight--{{ $param }}">
+    {{- if $param -}}
+    <div class="m-text-highlight__roofline">{{ T (printf "highlight.%s" $param) }}</div>
+    {{- end -}}
+    <div>
+{{ .Inner }}
+</div></div>