diff --git a/layouts/partials/keyword.html b/layouts/partials/keyword.html
deleted file mode 100644
index 9a5bbd6d..00000000
--- a/layouts/partials/keyword.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<span style="margin-top: 0.5rem" class="mr-2">
-  <span class="flex">
-    <span
-      class="rounded-full bg-primary-500 dark:bg-primary-300 text-neutral-50 dark:text-neutral-700 px-1 py-[1px] text-xs font-normal"
-    >
-      {{ . }}
-    </span>
-  </span>
-</span>
diff --git a/layouts/shortcodes/keyword.html b/layouts/shortcodes/keyword.html
index 0453a36c..a954847a 100644
--- a/layouts/shortcodes/keyword.html
+++ b/layouts/shortcodes/keyword.html
@@ -1 +1,12 @@
-{{ partial "keyword.html" .Inner }}
+{{ $icon := .Get "icon"}}
+<span style="margin-top: 0.5rem" class="flex mr-2">
+  <span
+    class="rounded-full bg-primary-500 dark:bg-primary-300 text-neutral-50 dark:text-neutral-700 px-1.5 py-[1px] text-xs font-normal"
+  >
+    <span class="flex items-center">
+      {{if $icon}}
+      <span class="mr-1">{{ partial "icon" $icon }}</span>
+      {{ end }} {{- .Inner | markdownify -}}
+    </span>
+  </span>
+</span>