diff --git a/layouts/partials/utils/icon.html b/layouts/partials/utils/icon.html
index 0119c24..85cd3cb 100644
--- a/layouts/partials/utils/icon.html
+++ b/layouts/partials/utils/icon.html
@@ -1,3 +1,4 @@
+{{/* Render raw svg icon from .Site.Data */}}
 {{- $icon := index site.Data.icons .name -}}
 
 {{- if not $icon -}}
diff --git a/layouts/shortcodes/icon.html b/layouts/shortcodes/icon.html
index 3478914..3c9b569 100644
--- a/layouts/shortcodes/icon.html
+++ b/layouts/shortcodes/icon.html
@@ -1,3 +1,4 @@
+{{- $name := .Get "name" | default (.Get 0) -}}
 {{- $icon := index site.Data.icons (.Get 0) -}}
 {{- $attributes := "height=1em"}}