diff --git a/layouts/partials/article/components/details.html b/layouts/partials/article/components/details.html
index 0fc62e2a..52319a45 100644
--- a/layouts/partials/article/components/details.html
+++ b/layouts/partials/article/components/details.html
@@ -30,7 +30,7 @@
 
     {{- if not .Date.IsZero -}}
     <footer class="article-time">
-        {{ (resources.Get "icons/clock.svg").Content | safeHTML }}
+        {{ partial "helper/icon" "clock" }}
         <time class="article-time--published">
             {{- .Date.Format (or .Site.Params.dateFormat.published "Jan 02, 2006") -}}
         </time>
diff --git a/layouts/partials/article/components/footer.html b/layouts/partials/article/components/footer.html
index 7f428702..7ea46ec8 100644
--- a/layouts/partials/article/components/footer.html
+++ b/layouts/partials/article/components/footer.html
@@ -3,14 +3,14 @@
 
     {{ if and (.Site.Params.article.license.enabled) (not (eq .Params.license false)) }}
     <section class="article-copyright">
-        {{ (resources.Get "icons/copyright.svg").Content | safeHTML }}
+        {{ partial "helper/icon" "copyright" }}
         <span>{{ default .Site.Params.article.license.default .Params.license }}</span>
     </section>
     {{ end }}
 
     {{- if ne .Lastmod .Date -}}
     <section class="article-time">
-        {{ (resources.Get "icons/clock.svg").Content | safeHTML }}
+        {{ partial "helper/icon" "clock" }}
         <span class="article-time--modified">
             {{ T "lastUpdatedOn" }} {{ .Lastmod.Format ( or .Site.Params.dateFormat.lastUpdated "Jan 02, 2006 15:04 MST" ) }}
         </span>
diff --git a/layouts/partials/helper/icon.html b/layouts/partials/helper/icon.html
new file mode 100644
index 00000000..72162e89
--- /dev/null
+++ b/layouts/partials/helper/icon.html
@@ -0,0 +1,6 @@
+{{- $iconFile := resources.GetMatch (printf "icons/%s.svg" .) -}}
+{{- if $iconFile -}}
+    {{- $iconFile.Content | safeHTML -}}
+{{- else -}}
+    {{- errorf "Error: icon '%s.svg' is not found under 'assets/icons' folder" . -}}
+{{- end -}}
\ No newline at end of file
diff --git a/layouts/partials/sidebar/left.html b/layouts/partials/sidebar/left.html
index 89911534..f1ab3558 100644
--- a/layouts/partials/sidebar/left.html
+++ b/layouts/partials/sidebar/left.html
@@ -33,7 +33,7 @@
         <li {{ if $active }} class='current' {{ end }}>
             <a href='{{ .URL | absLangURL }}'>
                 {{ if .Pre }}
-                    {{ (resources.Get (delimit (slice "icons/" .Pre ".svg") "")).Content | safeHTML }}
+                    {{ partial "helper/icon" .Pre }}
                 {{ end }}
                 <span>{{- .Name -}}</span>
             </a>
diff --git a/layouts/partials/widget/archives.html b/layouts/partials/widget/archives.html
index 82bdbf51..2aadfcdd 100644
--- a/layouts/partials/widget/archives.html
+++ b/layouts/partials/widget/archives.html
@@ -1,6 +1,6 @@
 <section class="widget archives">
     <div class="widget-icon">
-        {{ (resources.Get "icons/infinity.svg").Content | safeHTML }}
+        {{ partial "helper/icon" "infinity" }}
     </div>
     <h1 class="widget-title">{{ T "widgetArchivesTitle" }}</h1>
 
diff --git a/layouts/partials/widget/tag-cloud.html b/layouts/partials/widget/tag-cloud.html
index f852b4d3..cd5f357c 100644
--- a/layouts/partials/widget/tag-cloud.html
+++ b/layouts/partials/widget/tag-cloud.html
@@ -1,6 +1,6 @@
 <section class="widget tagCloud">
     <div class="widget-icon">
-        {{ (resources.Get "icons/tag.svg").Content | safeHTML }}
+        {{ partial "helper/icon" "tag" }}
     </div>
     <h1 class="widget-title">{{ T "widgetTagCloudTitle" }}</h1>