diff --git a/assets/sass/textHighlight.scss b/assets/sass/textHighlight.scss
index f35b1c57..eeaf0d09 100644
--- a/assets/sass/textHighlight.scss
+++ b/assets/sass/textHighlight.scss
@@ -12,6 +12,9 @@
   text-transform: uppercase;
   font-weight: bold;
   opacity: .8;
+  display: flex;
+  align-items: center;
+  gap: .4rem;
 }
 
 .m-text-highlight--tip {
diff --git a/layouts/shortcodes/highlight.html b/layouts/shortcodes/highlight.html
index 76e211e2..2d6895fd 100644
--- a/layouts/shortcodes/highlight.html
+++ b/layouts/shortcodes/highlight.html
@@ -1,7 +1,11 @@
 {{- $param := .Get 0 -}}
+{{ $iconMapping := dict "important" "error" "inofficial" "warning" "tip" "lightbulb_2" }}
+
 <div class="m-text-highlight m-text-highlight--{{ $param }}">
     {{- if $param -}}
-    <div class="m-text-highlight__roofline">{{ T (printf "highlight.%s" $param) }}</div>
+    <div class="m-text-highlight__roofline">
+        {{- partial "icon" (index $iconMapping $param) -}}
+        {{ T (printf "highlight.%s" $param) }}</div>
     {{- end -}}
     <div>
 {{ .Inner }}