diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index 2eb563e34..617094b12 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -37,7 +37,8 @@ <h1 class="single-title">
     {{- $categories := slice -}}
     {{- range .Params.categories -}}
         {{- $category := partialCached "function/path.html" . . | printf "/categories/%v" | $.Site.GetPage -}}
-        {{- $categories = $categories | append (printf `<a href="%v"><i class="far fa-folder fa-fw"></i>%v</a>` $category.RelPermalink $category.Title) -}}
+        {{- $icon := partial "plugin/fontawesome.html" (dict "Style" "regular" "Icon" "folder") -}}
+        {{- $categories = $categories | append (printf `<a href="%v">%v%v</a>` $category.RelPermalink $icon $category.Title) -}}
     {{- end -}}
     {{- with delimit $categories "&nbsp;" -}}
         &nbsp;<span class="post-category">
@@ -54,7 +55,8 @@ <h1 class="single-title">
     {{- $series := slice -}}
     {{- range .Params.series -}}
         {{- $singleSeries := partialCached "function/path.html" . . | printf "/series/%v" | $.Site.GetPage -}}
-        {{- $series = $series | append (printf `<a href="%v"><i class="far fa-list-alt fa-fw"></i>%v</a>` $singleSeries.RelPermalink $singleSeries.Title) -}}
+        {{- $icon := partial "plugin/fontawesome.html" (dict "Style" "regular" "Icon" "list-alt") -}}
+        {{- $series = $series | append (printf `<a href="%v">%v%v</a>` $singleSeries.RelPermalink $icon $singleSeries.Title) -}}
     {{- end -}}
     {{- with delimit $series "&nbsp;" -}}
         &nbsp;<span class="post-series">
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 8b295e715..6d161785b 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -20,7 +20,8 @@
                 {{- $post_info = $post_info | append $e -}}
             {{- end -}}
             {{- if ne .Site.Params.footer.hugo false -}}
-                {{- $theme := .Scratch.Get "version" | printf `<a href="https://github.com/HEIGE-PCloud/DoIt" target="_blank" rel="noopener noreferrer" title="DoIt %v"><i class="far fa-edit fa-fw"></i> DoIt</a>` -}}
+                {{- $icon := partial "plugin/fontawesome.html" (dict "Style" "regular" "Icon" "edit") -}}
+                {{- $theme := printf `<a href="https://github.com/HEIGE-PCloud/DoIt" target="_blank" rel="noopener noreferrer" title="DoIt %v">%v DoIt</a>` (.Scratch.Get "version") $icon -}}
                 {{- $e := dict "Theme" $theme | T "theme" -}}
                 {{- $post_info = $post_info | append $e -}}
             {{- end -}}
diff --git a/layouts/partials/function/checkbox.html b/layouts/partials/function/checkbox.html
index 2283592b9..b62095b43 100644
--- a/layouts/partials/function/checkbox.html
+++ b/layouts/partials/function/checkbox.html
@@ -1,9 +1,9 @@
 {{- /* Checkbox unchecked */ -}}
 {{- $old := `<input disabled="" type="checkbox">` -}}
-{{- $new := `<i class="far fa-square fa-fw"></i>` -}}
+{{- $new := partial "plugin/fontawesome.html" (dict "Style" "regular" "Icon" "square") -}}
 {{- $content := replace . $old $new -}}
 
 {{- /* Checkbox checked */ -}}
 {{- $old = `<input checked="" disabled="" type="checkbox">` -}}
-{{- $new = `<i class="far fa-check-square fa-fw"></i>` -}}
+{{- $new := partial "plugin/fontawesome.html" (dict "Style" "regular" "Icon" "check-square") -}}
 {{- return replace $content $old $new -}}
diff --git a/layouts/posts/single.html b/layouts/posts/single.html
index ec417e0f1..8d81371e2 100644
--- a/layouts/posts/single.html
+++ b/layouts/posts/single.html
@@ -55,7 +55,8 @@ <h2 class="single-subtitle">{{ . }}</h2>
                 {{- $categories := slice -}}
                 {{- range .Params.categories -}}
                     {{- $category := partialCached "function/path.html" . . | printf "/categories/%v" | $.Site.GetPage -}}
-                    {{- $categories = $categories | append (printf `<a href="%v"><i class="far fa-folder fa-fw"></i>%v</a>` $category.RelPermalink $category.Title) -}}
+                    {{- $icon := partial "plugin/fontawesome.html" (dict "Style" "regular" "Icon" "folder") -}}
+                    {{- $categories = $categories | append (printf `<a href="%v">%v%v</a>` $category.RelPermalink $icon $category.Title) -}}
                 {{- end -}}
                 {{- with delimit $categories "&nbsp;" -}}
                     &nbsp;<span class="post-category">
@@ -72,7 +73,8 @@ <h2 class="single-subtitle">{{ . }}</h2>
                 {{- $series := slice -}}
                 {{- range .Params.series -}}
                     {{- $singleSeries := partialCached "function/path.html" . . | printf "/series/%v" | $.Site.GetPage -}}
-                    {{- $series = $series | append (printf `<a href="%v"><i class="far fa-list-alt fa-fw"></i>%v</a>` $singleSeries.RelPermalink $singleSeries.Title) -}}
+                    {{- $icon := partial "plugin/fontawesome.html" (dict "Style" "regular" "Icon" "list-alt") -}}
+                    {{- $series = $series | append (printf `<a href="%v">%v%v</a>` $singleSeries.RelPermalink $icon $singleSeries.Title) -}}
                 {{- end -}}
                 {{- with delimit $series "&nbsp;" -}}
                     &nbsp;<span class="post-series">