diff --git a/assets/css/_partial/_details.scss b/assets/css/_partial/_details.scss
index b7930ec7f..6ca1ffd50 100644
--- a/assets/css/_partial/_details.scss
+++ b/assets/css/_partial/_details.scss
@@ -5,7 +5,7 @@
     }
   }
 
-  i.details-icon {
+  .details-icon > svg {
     color: $global-font-secondary-color;
     @include transition(transform 0.2s ease);
 
@@ -24,7 +24,7 @@
   }
 
   &.open {
-    i.details-icon {
+    .details-icon > svg {
       @include transform(rotate(90deg));
     }
 
diff --git a/assets/css/_partial/_single/_admonition.scss b/assets/css/_partial/_single/_admonition.scss
index 41c8cbcc2..f57190da8 100644
--- a/assets/css/_partial/_single/_admonition.scss
+++ b/assets/css/_partial/_single/_admonition.scss
@@ -22,7 +22,7 @@
     padding: .5rem 0;
   }
 
-  i.icon {
+  span.icon > svg {
     font-size: 0.85rem;
     color: map-get($admonition-color-map, 'note');
     position: absolute;
@@ -30,7 +30,7 @@
     left: .4rem;
   }
 
-  i.details-icon {
+  span.details-icon > svg {
     position: absolute;
     top: .6rem;
     right: .3rem;
@@ -40,7 +40,7 @@
     &.#{$type} {
       border-left-color: $color;
 
-      i.icon {
+      span.icon > svg {
         color: $color;
       }
     }
diff --git a/layouts/partials/plugin/fontawesome.html b/layouts/partials/plugin/fontawesome.html
index f51186177..7ee8784e6 100644
--- a/layouts/partials/plugin/fontawesome.html
+++ b/layouts/partials/plugin/fontawesome.html
@@ -1,3 +1,9 @@
 {{- $path := printf "lib/fontawesome-free/svgs/%v/%v.svg" .Style .Icon -}}
-{{- $resource := (resources.Get $path).Content -}}
-{{- $resource | replaceRE `<svg xmlns="http://www.w3.org/2000/svg"` `<svg class="icon" xmlns="http://www.w3.org/2000/svg"` | safeHTML -}}
+
+{{- $resource := (resources.Get $path) -}}
+{{ if not $resource }}
+    {{- errorf "Fontawesome icon does not exist %v" $path -}}
+{{- end -}}
+{{- $resource := $resource.Content -}}
+{{- $resource | replaceRE `<svg xmlns="http://www.w3.org/2000/svg" ` `<svg class="icon"
+    xmlns="http://www.w3.org/2000/svg" ` | safeHTML -}}
\ No newline at end of file
diff --git a/layouts/shortcodes/admonition.html b/layouts/shortcodes/admonition.html
index bfe145267..6232cc525 100644
--- a/layouts/shortcodes/admonition.html
+++ b/layouts/shortcodes/admonition.html
@@ -1,24 +1,29 @@
 {{- $inner := .Inner | .Page.RenderString -}}
 
-{{- $iconMap := dict "note" "fas fa-pencil-alt fa-fw" -}}
-{{- $iconMap  = dict "abstract" "fas fa-list-ul fa-fw" | merge $iconMap -}}
-{{- $iconMap  = dict "info" "fas fa-info-circle fa-fw" | merge $iconMap -}}
-{{- $iconMap  = dict "tip" "fas fa-lightbulb fa-fw" | merge $iconMap -}}
-{{- $iconMap  = dict "success" "fas fa-check-circle fa-fw" | merge $iconMap -}}
-{{- $iconMap  = dict "question" "fas fa-question-circle fa-fw" | merge $iconMap -}}
-{{- $iconMap  = dict "warning" "fas fa-exclamation-triangle fa-fw" | merge $iconMap -}}
-{{- $iconMap  = dict "failure" "fas fa-times-circle fa-fw" | merge $iconMap -}}
-{{- $iconMap  = dict "danger" "fas fa-skull-crossbones fa-fw" | merge $iconMap -}}
-{{- $iconMap  = dict "bug" "fas fa-bug fa-fw" | merge $iconMap -}}
-{{- $iconMap  = dict "example" "fas fa-list-ol fa-fw" | merge $iconMap -}}
-{{- $iconMap  = dict "quote" "fas fa-quote-right fa-fw" | merge $iconMap -}}
-{{- $iconDetails := "fas fa-angle-right fa-fw" -}}
+{{- $iconMap := dict "note" (dict "Style" "solid" "Icon" "pencil-alt") -}}
+{{- $iconMap  = dict "abstract" (dict "Style" "solid" "Icon" "list-ul") | merge $iconMap -}}
+{{- $iconMap  = dict "info" (dict "Style" "solid" "Icon" "info-circle") | merge $iconMap -}}
+{{- $iconMap  = dict "tip" (dict "Style" "solid" "Icon" "lightbulb") | merge $iconMap -}}
+{{- $iconMap  = dict "success" (dict "Style" "solid" "Icon" "check-circle") | merge $iconMap -}}
+{{- $iconMap  = dict "question" (dict "Style" "solid" "Icon" "question-circle") | merge $iconMap -}}
+{{- $iconMap  = dict "warning" (dict "Style" "solid" "Icon" "exclamation-triangle") | merge $iconMap -}}
+{{- $iconMap  = dict "failure" (dict "Style" "solid" "Icon" "times-circle") | merge $iconMap -}}
+{{- $iconMap  = dict "danger" (dict "Style" "solid" "Icon" "skull-crossbones") | merge $iconMap -}}
+{{- $iconMap  = dict "bug" (dict "Style" "solid" "Icon" "bug") | merge $iconMap -}}
+{{- $iconMap  = dict "example" (dict "Style" "solid" "Icon" "list-ol") | merge $iconMap -}}
+{{- $iconMap  = dict "quote" (dict "Style" "solid" "Icon" "quote-right") | merge $iconMap -}}
 
 {{- if .IsNamedParams -}}
     {{- $type := .Get "type" | default "note" -}}
     <div class="details admonition {{ $type }}{{ if .Get `open` | ne false }} open{{ end }}">
         <div class="details-summary admonition-title">
-            <i class="icon {{ index $iconMap $type | default (index $iconMap "note") }}"></i>{{ .Get "title" | default (T $type) }}<i class="details-icon {{ $iconDetails }}"></i>
+            <span class="icon">
+                {{- partial "plugin/fontawesome.html" (index $iconMap $type | default (index $iconMap "note")) -}}
+            </span>
+            {{- .Get "title" | default (T $type) -}}
+            <span class="details-icon">
+                {{- partial "plugin/fontawesome.html" (dict "Style" "solid" "Icon" "angle-right") -}}
+            </span>
         </div>
         <div class="details-content">
             <div class="admonition-content">
@@ -30,7 +35,13 @@
     {{- $type := .Get 0 | default "note" -}}
     <div class="details admonition {{ $type }}{{ if .Get 2 | ne false }} open{{ end }}">
         <div class="details-summary admonition-title">
-            <i class="icon {{ index $iconMap $type | default (index $iconMap "note") }}"></i>{{ .Get 1 | default (T $type) }}<i class="details-icon {{ $iconDetails }}"></i>
+            <span class="icon">
+                {{- partial "plugin/fontawesome.html" (index $iconMap $type | default (index $iconMap "note")) -}}
+            </span>
+            {{ .Get 1 | default (T $type) }}
+            <span class="details-icon">
+                {{- partial "plugin/fontawesome.html" (dict "Style" "solid" "Icon" "angle-right") -}}
+            </span>
         </div>
         <div class="details-content">
             <div class="admonition-content">