delete-font-awesome

17 files changed, 76 insertions, 120 deletions

diff --git a/layouts/404.html b/layouts/404.html
index 25d445d..7829b6f 100644
--- a/layouts/404.html
+++ b/layouts/404.html
@@ -7,7 +7,7 @@
         <h1 id="error-emoji"></h1>
         <p class="error-text">
             {{- T "pageNotFoundText" -}}&nbsp;
-            <a href="javascript:void(0);" title="{{ T `back` }}" onclick="window.history.back();"><i class="far fa-hand-point-left fa-fw"></i></a>
+            <a href="javascript:void(0);" title="{{ T `back` }}" onclick="window.history.back();">{{ T `back` }}</a>
         </p>
     </div>
     <script>
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index dfa3037..b53c2bb 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -44,12 +44,12 @@
         <div id="fixed-buttons">
             {{- /* top button */ -}}
             <a href="#" id="back-to-top" class="fixed-button" title="{{ T `backToTop` }}">
-                <i class="fas fa-arrow-up fa-fw"></i>
+                <i class="svg-icon icon-arrow-up"></i>
             </a>
 
             {{- /* comment button */ -}}
             <a href="#" id="view-comments" class="fixed-button" title="{{ T `viewComments` }}">
-                <i class="fas fa-comment fa-fw"></i>
+                <i class="svg-icon icon-comments-fixed"></i>
             </a>
         </div>
 
diff --git a/layouts/_default/single.html b/layouts/_default/single.html
index a34e22b..21babed 100644
--- a/layouts/_default/single.html
+++ b/layouts/_default/single.html
@@ -15,7 +15,7 @@
 
         {{- /* Content */ -}}
         <div class="content" id="content">
-            {{- dict "Content" .Content "Ruby" $params.ruby "Fraction" $params.fraction "Fontawesome" $params.fontawesome | partial "function/content.html" | safeHTML -}}
+            {{- dict "Content" .Content "Ruby" $params.ruby "Fraction" $params.fraction | partial "function/content.html" | safeHTML -}}
         </div>
 
         {{- /* Comment */ -}}
diff --git a/layouts/_default/summary.html b/layouts/_default/summary.html
index 8b92db8..55da6e2 100644
--- a/layouts/_default/summary.html
+++ b/layouts/_default/summary.html
@@ -42,14 +42,14 @@
             {{ $author := index .Site.Data.authors $authorName }}
             {{- $authorLink := $author.link | default .Site.Home.RelPermalink -}}
             <span class="post-author">
-            {{- $options := dict "Class" "author" "Destination" $authorLink "Title" "Author" "Rel" "author" "Icon" (dict "Class" "fas fa-user-circle fa-fw") "Content" $author.nickname -}}
+            {{- $options := dict "Class" "author" "Destination" $authorLink "Title" "Author" "Rel" "author" "Icon" (dict "Class" "svg-icon icon-user") "Content" $author.nickname -}}
             {{- partial "plugin/link.html" $options -}}
             </span>
             {{- end -}}
 
             {{- with .Site.Params.dateFormat | default "2006-01-02" | .PublishDate.Format -}}
             {{- $timeAgoDate:= $.Site.Params.TimeAgo.DateFormat | default "2006-01-02" | $.PublishDate.Format -}}
-            &nbsp;&nbsp;&nbsp;<span class="post-publish"><i class="far fa-clock fa-fw"></i>
+            &nbsp;&nbsp;&nbsp;<span class="post-publish"><span class="svg-icon icon-clock"></span>
                 {{- printf `<time class="timeago" datetime="%v">%v</time>` $timeAgoDate . | safeHTML -}}
             </span>
             {{- end -}}
@@ -57,7 +57,7 @@
             {{- $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) -}}
+            {{- $categories = $categories | append (printf `<a href="%v"><span class="svg-icon icon-folder"></span>%v</a>` $category.RelPermalink $category.Title) -}}
             {{- end -}}
             {{- with delimit $categories "&nbsp;" -}}
             &nbsp;&nbsp;&nbsp;<span class="post-category">
@@ -66,13 +66,13 @@
             {{- end -}}
 
             {{- with .Params.Views -}}
-            &nbsp;&nbsp;&nbsp;<i class="far fa-eye fa-fw"></i><span>&nbsp;{{ . }}</span>
+            &nbsp;&nbsp;&nbsp;<span class="svg-icon icon-eye"></span>&nbsp;{{ . }}</span>
             {{- end -}}
 
             {{- $comment := .Site.Params.Comment -}}
             {{- $remark42 := $comment.remark42 | default dict -}}
             {{- if $remark42.enable -}}
-            &nbsp;&nbsp;&nbsp;<i class="far fa-comment fa-fw"></i>
+            &nbsp;&nbsp;&nbsp;<span class="svg-icon icon-comments"></span>
             <span class="remark42__counter" data-url="{{ .Permalink }}"></span>
             {{- end -}}
         </div>
@@ -82,7 +82,7 @@
         {{- if not $params.summaryStyle.hiddenDescription -}}
         <div class="content summary-content">
             {{- with .Summary -}}
-            {{- dict "Content" . "Ruby" $params.ruby "Fraction" $params.fraction "Fontawesome" $params.fontawesome | partial "function/content.html" | safeHTML -}}
+            {{- dict "Content" . "Ruby" $params.ruby "Fraction" $params.fraction | partial "function/content.html" | safeHTML -}}
             {{- else -}}
             {{- .Description | safeHTML -}}
             {{- end -}}
diff --git a/layouts/index.html b/layouts/index.html
index 17f4f02..1c41cc7 100644
--- a/layouts/index.html
+++ b/layouts/index.html
@@ -13,7 +13,7 @@
         {{- if .Content -}}
             <div class="single">
                 <div class="content" id="content">
-                    {{- dict "Content" .Content "Ruby" $params.ruby "Fraction" $params.fraction "Fontawesome" $params.fontawesome | partial "function/content.html" | safeHTML -}}
+                    {{- dict "Content" .Content "Ruby" $params.ruby "Fraction" $params.fraction | partial "function/content.html" | safeHTML -}}
                 </div>
             </div>
         {{- end -}}
diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index 299bd5b..8773303 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -12,7 +12,7 @@
             {{- if ne .Site.Params.footer.hugo false -}}
                 <div class="footer-line">
                     {{- $hugo := printf `<a href="https://gohugo.io/" target="_blank" rel="noopener noreffer" title="Hugo %v">Hugo</a>` hugo.Version -}}
-                    {{- $theme := .Scratch.Get "version" | printf `<a href="https://ublogger.netlify.app/?utm_source=%v&utm_medium=footer&utm_campaign=config&utm_term=%v" target="_blank" title="uBlogger %v"><i class="fas fa-pencil-alt fa-fw"></i> uBlogger</a>` $.Site.BaseURL (.Scratch.Get "version") -}}
+                    {{- $theme := .Scratch.Get "version" | printf `<a href="https://ublogger.netlify.app/?utm_source=%v&utm_medium=footer&utm_campaign=config&utm_term=%v" target="_blank" title="uBlogger %v">uBlogger</a>` $.Site.BaseURL (.Scratch.Get "version") -}}
                     {{- dict "Hugo" $hugo "Theme" $theme | T "poweredBySome" | safeHTML }}
                 </div>
             {{- end -}}
@@ -20,7 +20,7 @@
             <div class="footer-line">
                 {{- /* Copyright year */ -}}
                 {{- if ne .Site.Params.footer.copyright false -}}
-                    <i class="far fa-copyright fa-fw"></i>
+                    <i class="svg-icon icon-copyright"></i>
                     {{- with .Site.Params.footer.since -}}
                         <span>
                             {{- if lt . now.Year }}{{ . }} - {{ end }}{{ now.Year -}}
diff --git a/layouts/partials/function/content.html b/layouts/partials/function/content.html
index fbc7731..5468c7a 100644
--- a/layouts/partials/function/content.html
+++ b/layouts/partials/function/content.html
@@ -9,10 +9,6 @@
     {{- $content = partial "function/fraction.html" $content -}}
 {{- end -}}
 
-{{- if .Fontawesome -}}
-    {{- $content = partial "function/fontawesome.html" $content -}}
-{{- end -}}
-
 {{- $content = partial "function/checkbox.html" $content -}}
 
 {{- $content = partial "function/escape.html" $content -}}
diff --git a/layouts/partials/function/fontawesome.html b/layouts/partials/function/fontawesome.html
deleted file mode 100644
index 9d64c3d..0000000
--- a/layouts/partials/function/fontawesome.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{{- /* Font Awesome */ -}}
-{{- /* :(far fa-circle): -> <i class="far fa-circle fa-fw"></i> */ -}}
-
-{{- $REin := ` (:\([\w- ]+?\):)` -}}
-{{- $REout := `&nbsp;$1` -}}
-{{- $content := replaceRE $REin $REout . -}}
-
-{{- $REin = `(:\([\w- ]+?\):) ` -}}
-{{- $REout = `$1&nbsp;` -}}
-{{- $content = replaceRE $REin $REout . -}}
-
-{{- $REin = `:\(([\w- ]+?)\):` -}}
-{{- $REout = `<i class="$1"></i>` -}}
-{{- return replaceRE $REin $REout $content -}}
diff --git a/layouts/partials/head/link.html b/layouts/partials/head/link.html
index 6d2afa7..3cae7e9 100644
--- a/layouts/partials/head/link.html
+++ b/layouts/partials/head/link.html
@@ -47,11 +47,6 @@
 {{- $style = dict "Context" . "ToCSS" $options | merge $style -}}
 {{- partial "plugin/style.html" $style -}}
 
-{{- /* Font Awesome */ -}}
-{{- $source := $cdn.fontawesomeFreeCSS | default "lib/fontawesome-free/all.min.css" -}}
-{{- $style := dict "Source" $source "Fingerprint" $fingerprint -}}
-{{- partial "plugin/style.html" $style -}}
-
 {{- /* Animate.css */ -}}
 {{- $source := $cdn.animateCSS | default "lib/animate/animate.min.css" -}}
 {{- $style := dict "Source" $source "Fingerprint" $fingerprint -}}
diff --git a/layouts/partials/header.html b/layouts/partials/header.html
index f321493..7ffc9dd 100644
--- a/layouts/partials/header.html
+++ b/layouts/partials/header.html
@@ -42,7 +42,6 @@
                 {{- if .Site.IsMultiLingual -}}
                     <a href="javascript:void(0);" class="menu-item language" title="{{ T "selectLanguage" }}">
                         {{- .Language.LanguageName -}}
-                        <i class="fas fa-chevron-right fa-fw"></i>
                         <select class="language-select" id="language-select-desktop" onchange="location = this.value;">
                             {{- if eq .Kind "404" -}}
                                 {{- range .Sites -}}
@@ -65,18 +64,18 @@
                     <span class="menu-item search" id="search-desktop">
                         <input type="text" placeholder="{{ .Site.Params.search.placeholder | default (T `searchPlaceholder`) }}" id="search-input-desktop">
                         <a href="javascript:void(0);" class="search-button search-toggle" id="search-toggle-desktop" title="{{ T `search` }}">
-                            <i class="fas fa-search fa-fw"></i>
+                            <span class="svg-icon icon-search"></span>
                         </a>
                         <a href="javascript:void(0);" class="search-button search-clear" id="search-clear-desktop" title="{{ T `clear` }}">
-                            <i class="fas fa-times-circle fa-fw"></i>
+                            <span class="svg-icon icon-cancel"></span>
                         </a>
                         <span class="search-button search-loading" id="search-loading-desktop">
-                            <i class="fas fa-spinner fa-fw fa-spin"></i>
+                            <span class="svg-icon icon-loading"></span>
                         </span>
                     </span>
                 {{- end -}}
                 <a href="javascript:void(0);" class="menu-item theme-switch" title="{{ T "switchTheme" }}">
-                    <i class="fas fa-adjust fa-fw"></i>
+                    <span class="svg-icon icon-moon"></span>
                 </a>
             </div>
         </div>
@@ -121,13 +120,13 @@
                     <div class="search mobile" id="search-mobile">
                         <input type="text" placeholder="{{ .Site.Params.search.placeholder | default (T `searchPlaceholder`) }}" id="search-input-mobile">
                         <a href="javascript:void(0);" class="search-button search-toggle" id="search-toggle-mobile" title="{{ T `search` }}">
-                            <i class="fas fa-search fa-fw"></i>
+                            <span class="svg-icon icon-search"></span>
                         </a>
                         <a href="javascript:void(0);" class="search-button search-clear" id="search-clear-mobile" title="{{ T `clear` }}">
-                            <i class="fas fa-times-circle fa-fw"></i>
+                            <span class="svg-icon icon-cancel"></span>
                         </a>
                         <span class="search-button search-loading" id="search-loading-mobile">
-                            <i class="fas fa-spinner fa-fw fa-spin"></i>
+                            <span class="svg-icon icon-loading"></span>
                         </span>
                     </div>
                     <a href="javascript:void(0);" class="search-cancel" id="search-cancel-mobile">
@@ -146,12 +145,11 @@
                 </a>
             {{- end -}}
             <a href="javascript:void(0);" class="menu-item theme-switch" title="{{ T "switchTheme" }}">
-                <i class="fas fa-adjust fa-fw"></i>
+                <span class="svg-icon icon-moon"></span>
             </a>
             {{- if .Site.IsMultiLingual -}}
                 <a href="javascript:void(0);" class="menu-item" title="{{ T "selectLanguage" }}">
                     {{- .Language.LanguageName -}}
-                    <i class="fas fa-chevron-right fa-fw"></i>
                     <select class="language-select" onchange="location = this.value;">
                         {{- if eq .Kind "404" -}}
                             {{- range .Sites -}}
diff --git a/layouts/partials/plugin/share.html b/layouts/partials/plugin/share.html
index 7b29f7b..fc479ed 100644
--- a/layouts/partials/plugin/share.html
+++ b/layouts/partials/plugin/share.html
@@ -7,7 +7,7 @@
     {{- if $share.Telegram -}}
     <div class="share-link">
         <a class="share-icon share-telegram" href="javascript:void(0);" title="{{ T `shareOn` }} Telegram" data-sharer="telegram" data-url="{{ .Permalink }}" data-title="{{ .Title }}"{{ with .Site.Params.Social.Telegram }} data-via="{{ . }}"{{ end }}{{ with .Params.tags }} data-hashtags="{{ delimit . `,` }}"{{ end }}>
-            {{- dict "Class" "fab fa-telegram fa-fw" | partial "plugin/icon.html" -}}
+            {{- dict "Class" "svg-social-icon icon-telegram" | partial "plugin/icon.html" -}}
         </a>
     </div>
     {{- end -}}
@@ -16,7 +16,7 @@
     {{- if $share.Twitter -}}
 <div class="share-link">
         <a class="share-icon share-twitter" href="javascript:void(0);" title="{{ T `shareOn` }} Twitter" data-sharer="twitter" data-url="{{ .Permalink }}" data-title="{{ .Title }}"{{ with .Site.Params.Social.Twitter }} data-via="{{ . }}"{{ end }}{{ with .Params.tags }} data-hashtags="{{ delimit . `,` }}"{{ end }}>
-            {{- dict "Class" "fab fa-twitter fa-fw" | partial "plugin/icon.html" -}}
+            {{- dict "Class" "svg-social-icon icon-twitter" | partial "plugin/icon.html" -}}
         </a>
 </div>
     {{- end -}}
@@ -25,7 +25,7 @@
     {{- if $share.Facebook -}}
     <div class="share-link">
         <a class="share-icon share-facebook" href="javascript:void(0);" title="{{ T `shareOn` }} Facebook" data-sharer="facebook" data-url="{{ .Permalink }}"{{ with .Params.tags }} data-hashtag="{{ index . 0 }}"{{ end }}>
-            {{- dict "Class" "fab fa-facebook-square fa-fw" | partial "plugin/icon.html" -}}
+            {{- dict "Class" "svg-social-icon icon-facebook" | partial "plugin/icon.html" -}}
         </a>
     </div>
     {{- end -}}
@@ -34,7 +34,7 @@
     {{- if $share.Linkedin -}}
         <div class="share-link">
         <a class="share-icon share-linkedin" href="javascript:void(0);" title="{{ T `shareOn` }} Linkedin" data-sharer="linkedin" data-url="{{ .Permalink }}">
-            {{- dict "Class" "fab fa-linkedin fa-fw" | partial "plugin/icon.html" -}}
+            {{- dict "Class" "svg-social-icon icon-linkedin" | partial "plugin/icon.html" -}}
         </a>
         </div>
     {{- end -}}
@@ -43,7 +43,7 @@
     {{- if $share.Whatsapp -}}
             <div class="share-link">
         <a class="share-icon share-whatsapp" href="javascript:void(0);" title="{{ T `shareOn` }} WhatsApp" data-sharer="whatsapp" data-url="{{ .Permalink }}" data-title="{{ .Title }}" data-web>
-            {{- dict "Class" "fab fa-whatsapp fa-fw" | partial "plugin/icon.html" -}}
+            {{- dict "Class" "svg-social-icon icon-whatsapp" | partial "plugin/icon.html" -}}
         </a>
             </div>
     {{- end -}}
@@ -52,7 +52,7 @@
     {{- if $share.Viber -}}
                 <div class="share-link">
         <a class="share-icon share-viber" href="javascript:void(0);" title="{{ T `shareOn` }} Viber" data-sharer="viber" data-url="{{ .Permalink }}" data-title="{{ .Title }}">
-            {{- dict "Class" "fab fa-viber fa-fw" | partial "plugin/icon.html" -}}
+            {{- dict "Class" "svg-social-icon icon-viber" | partial "plugin/icon.html" -}}
         </a>
                 </div>
     {{- end -}}
@@ -61,7 +61,7 @@
     {{- if $share.Pinterest -}}
                     <div class="share-link">
         <a class="share-icon share-pinterest" href="javascript:void(0);" title="{{ T `shareOn` }} Pinterest" data-sharer="pinterest" data-url="{{ .Permalink }}"{{ with .Description }} data-description="{{ . }}"{{ end }}{{ with .Params.featuredImage }} data-image="{{ . }}"{{ end }}>
-            {{- dict "Class" "fab fa-pinterest fa-fw" | partial "plugin/icon.html" -}}
+            {{- dict "Class" "svg-social-icon icon-pinterest" | partial "plugin/icon.html" -}}
         </a>
                     </div>
     {{- end -}}
@@ -70,7 +70,7 @@
     {{- if $share.Tumblr -}}
                         <div class="share-link">
         <a class="share-icon share-tumblr" href="javascript:void(0);" title="{{ T `shareOn` }} Tumblr" data-sharer="tumblr" data-url="{{ .Permalink }}" data-title="{{ .Title }}"{{ with .Description }} data-caption="{{ . }}"{{ end }}{{ with .Params.tags }} data-tags="{{ delimit . `,` }}"{{ end }}>
-            {{- dict "Class" "fab fa-tumblr fa-fw" | partial "plugin/icon.html" -}}
+            {{- dict "Class" "svg-social-icon icon-tumblr" | partial "plugin/icon.html" -}}
         </a>
                         </div>
     {{- end -}}
@@ -79,7 +79,7 @@
     {{- if $share.Reddit -}}
                             <div class="share-link">
         <a class="share-icon share-reddit" href="javascript:void(0);" title="{{ T `shareOn` }} Reddit" data-sharer="reddit" data-url="{{ .Permalink }}">
-            {{- dict "Class" "fab fa-reddit fa-fw" | partial "plugin/icon.html" -}}
+            {{- dict "Class" "svg-social-icon icon-reddit" | partial "plugin/icon.html" -}}
         </a>
                             </div>
     {{- end -}}
@@ -88,7 +88,7 @@
     {{- if $share.VK -}}
                                 <div class="share-link">
         <a class="share-icon share-vk" href="javascript:void(0);" title="{{ T `shareOn` }} VK" data-sharer="vk" data-url="{{ .Permalink }}" data-title="{{ .Title }}"{{ with .Description }} data-caption="{{ . }}"{{ end }}{{ with .Params.featuredImage }} data-image="{{ . }}"{{ end }}>
-            {{- dict "Class" "fab fa-vk fa-fw" | partial "plugin/icon.html" -}}
+            {{- dict "Class" "svg-social-icon icon-vk" | partial "plugin/icon.html" -}}
         </a>
                                 </div>
     {{- end -}}
@@ -97,7 +97,7 @@
     {{- if $share.Buffer -}}
                                     <div class="share-link">
         <a class="share-icon share-buffer" href="javascript:void(0);" title="{{ T `shareOn` }} Buffer" data-sharer="buffer" data-url="{{ .Permalink }}" data-title="{{ .Title }}"{{ with .Site.Params.Social.Twitter }} data-via="{{ . }}"{{ end }}{{ with .Params.featuredImage }} data-picture="{{ . }}"{{ end }}>
-            {{- dict "Class" "fab fa-buffer fa-fw" | partial "plugin/icon.html" -}}
+            {{- dict "Class" "svg-social-icon icon-buffer" | partial "plugin/icon.html" -}}
         </a>
                                     </div>
     {{- end -}}
@@ -106,7 +106,7 @@
     {{- if $share.Xing -}}
                                         <div class="share-link">
         <a class="share-icon share-xing" href="javascript:void(0);" title="{{ T `shareOn` }} Xing" data-sharer="xing" data-url="{{ .Permalink }}" data-title="{{ .Title }}">
-            {{- dict "Class" "fab fa-xing fa-fw" | partial "plugin/icon.html" -}}
+            {{- dict "Class" "svg-social-icon icon-xing" | partial "plugin/icon.html" -}}
         </a>
                                         </div>
     {{- end -}}
@@ -133,7 +133,7 @@
     {{- if $share.Pocket -}}
     <div class="share-link">
         <a class="share-icon share-pocket" href="javascript:void(0);" title="{{ T `shareOn` }} Pocket" data-sharer="pocket" data-url="{{ .Permalink }}">
-            {{- dict "Class" "fab fa-get-pocket fa-fw" | partial "plugin/icon.html" -}}
+            {{- dict "Class" "svg-social-icon icon-pocket" | partial "plugin/icon.html" -}}
         </a>
     </div>
     {{- end -}}
@@ -142,7 +142,7 @@
     {{- if $share.Digg -}}
         <div class="share-link">
         <a class="share-icon share-digg" href="javascript:void(0);" title="{{ T `shareOn` }} Digg" data-sharer="digg" data-url="{{ .Permalink }}">
-            {{- dict "Class" "fab fa-digg fa-fw" | partial "plugin/icon.html" -}}
+            {{- dict "Class" "svg-social-icon icon-digg" | partial "plugin/icon.html" -}}
         </a>
         </div>
     {{- end -}}
@@ -151,7 +151,7 @@
     {{- if $share.Stumbleupon -}}
             <div class="share-link">
         <a class="share-icon share-stumbleupon" href="javascript:void(0);" title="{{ T `shareOn` }} StumbleUpon" data-sharer="stumbleupon" data-url="{{ .Permalink }}" data-title="{{ .Title }}">
-            {{- dict "Class" "fab fa-stumbleupon fa-fw" | partial "plugin/icon.html" -}}
+            {{- dict "Class" "svg-social-icon icon-stumbleupon" | partial "plugin/icon.html" -}}
         </a>
             </div>
     {{- end -}}
@@ -160,7 +160,7 @@
     {{- if $share.Flipboard -}}
                 <div class="share-link">
         <a class="share-icon share-flipboard" href="javascript:void(0);" title="{{ T `shareOn` }} Flipboard" data-sharer="flipboard" data-url="{{ .Permalink }}" data-title="{{ .Title }}">
-            {{- dict "Class" "fab fa-flipboard fa-fw" | partial "plugin/icon.html" -}}
+            {{- dict "Class" "svg-social-icon icon-flipboard" | partial "plugin/icon.html" -}}
         </a>
                 </div>
     {{- end -}}
@@ -169,7 +169,7 @@
     {{- if $share.Weibo -}}
                     <div class="share-link">
         <a class="share-icon share-weibo" href="javascript:void(0);" title="{{ T `shareOn` }} 微博" data-sharer="weibo" data-url="{{ .Permalink }}" data-title="{{ .Title }}"{{ with .Params.featuredImage }} data-image="{{ . }}"{{ end }}{{ with .Site.Params.Social.Weibo }} data-ralateuid="{{ . }}"{{ end }}>
-            {{- dict "Class" "fab fa-weibo fa-fw" | partial "plugin/icon.html" -}}
+            {{- dict "Class" "svg-social-icon icon-weibo" | partial "plugin/icon.html" -}}
         </a>
                     </div>
     {{- end -}}
@@ -178,7 +178,7 @@
     {{- if $share.Renren -}}
                         <div class="share-link">
         <a class="share-icon share-renren" href="javascript:void(0);" title="{{ T `shareOn` }} 人人" data-sharer="renren" data-url="{{ .Permalink }}">
-            {{- dict "Class" "fab fa-renren fa-fw" | partial "plugin/icon.html" -}}
+            {{- dict "Class" "svg-social-icon icon-renren" | partial "plugin/icon.html" -}}
         </a>
                         </div>
     {{- end -}}
@@ -196,7 +196,7 @@
     {{- if $share.Blogger -}}
                                 <div class="share-link">
         <a class="share-icon share-blogger" href="javascript:void(0);" title="{{ T `shareOn` }} Blogger" data-sharer="blogger" data-url="{{ .Permalink }}" data-title="{{ .Title }}" data-description="{{ .Description }}">
-            {{- dict "Class" "fab fa-blogger fa-fw" | partial "plugin/icon.html" -}}
+            {{- dict "Class" "svg-social-icon icon-blogger" | partial "plugin/icon.html" -}}
         </a>
                                 </div>
     {{- end -}}
@@ -214,7 +214,7 @@
     {{- if $share.Odnoklassniki -}}
                                         <div class="share-link">
         <a class="share-icon share-ok" href="javascript:void(0);" title="{{ T `shareOn` }} OK.RU" data-sharer="okru" data-url="{{ .Permalink }}" data-title="{{ .Title }}">
-            {{- dict "Class" "fab fa-odnoklassniki fa-fw" | partial "plugin/icon.html" -}}
+            {{- dict "Class" "svg-social-icon icon-odnoklassniki" | partial "plugin/icon.html" -}}
         </a>
                                         </div>
     {{- end -}}
@@ -223,7 +223,7 @@
     {{- if $share.Evernote -}}
                                             <div class="share-link">
         <a class="share-icon share-evernote" href="javascript:void(0);" title="{{ T `shareOn` }} Evernote" data-sharer="evernote" data-url="{{ .Permalink }}" data-title="{{ .Title }}">
-            {{- dict "Class" "fab fa-evernote fa-fw" | partial "plugin/icon.html" -}}
+            {{- dict "Class" "svg-social-icon icon-evernote" | partial "plugin/icon.html" -}}
         </a>
                                             </div>
     {{- end -}}
@@ -232,7 +232,7 @@
     {{- if $share.Skype -}}
                                                 <div class="share-link">
         <a class="share-icon share-skype" href="javascript:void(0);" title="{{ T `shareOn` }} Skype" data-sharer="skype" data-url="{{ .Permalink }}" data-title="{{ .Title }}">
-            {{- dict "Class" "fab fa-skype fa-fw" | partial "plugin/icon.html" -}}
+            {{- dict "Class" "svg-social-icon icon-skype" | partial "plugin/icon.html" -}}
         </a>
                                                 </div>
     {{- end -}}
@@ -241,7 +241,7 @@
     {{- if $share.Trello -}}
                                                     <div class="share-link">
         <a class="share-icon share-trello" href="javascript:void(0);" title="{{ T `shareOn` }} Trello" data-sharer="trello" data-url="{{ .Permalink }}" data-title="{{ .Title }}" data-description="{{ .Description }}">
-            {{- dict "Class" "fab fa-trello fa-fw" | partial "plugin/icon.html" -}}
+            {{- dict "Class" "svg-social-icon icon-trello" | partial "plugin/icon.html" -}}
         </a>
                                                     </div>
     {{- end -}}
@@ -250,7 +250,7 @@
     {{- if $share.Mix -}}
                                                         <div class="share-link">
         <a class="share-icon share-mix" href="//mix.com/add?url={{ .Permalink }}&amp;description={{ .Title }}" target="_blank" title="{{ T `shareOn` }} Mix">
-            {{- dict "Class" "fab fa-mix fa-fw" | partial "plugin/icon.html" -}}
+            {{- dict "Class" "svg-social-icon icon-mix" | partial "plugin/icon.html" -}}
         </a>
                                                         </div>
     {{- end -}}
@@ -258,7 +258,7 @@
     {{- /* 029: Hacker News */ -}}
     {{- if $share.Hackernews -}}
     <a class="share-icon share-hackernews" href="javascript:void(0);" title="{{ T `shareOn` }} Hacker News" data-sharer="hackernews" data-url="{{ .Permalink }}" data-title="{{ .Title }}">
-        {{- dict "Class" "fab fa-hacker-news fa-fw" | partial "plugin/icon.html" -}}
+        {{- dict "Class" "svg-social-icon icon-hacker-news" | partial "plugin/icon.html" -}}
     </a>
     {{- end -}}
 {{- end -}}
diff --git a/layouts/partials/rss/item-turbo.html b/layouts/partials/rss/item-turbo.html
index ec31841..03e2d56 100644
--- a/layouts/partials/rss/item-turbo.html
+++ b/layouts/partials/rss/item-turbo.html
@@ -24,10 +24,10 @@
         {{- end -}}
         {{- $content := .Page.Description -}}
         {{- if $params.rssFullText -}}
-            {{- $content = dict "Content" .Page.Content "Ruby" $params.ruby "Fraction" $params.fraction "Fontawesome" $params.fontawesome | partial "function/content.html" -}}
+            {{- $content = dict "Content" .Page.Content "Ruby" $params.ruby "Fraction" $params.fraction | partial "function/content.html" -}}
         {{- else -}}
             {{- with .Page.Summary -}}
-                {{- $content = dict "Content" . "Ruby" $params.ruby "Fraction" $params.fraction "Fontawesome" $params.fontawesome | partial "function/content.html" -}}
+                {{- $content = dict "Content" . "Ruby" $params.ruby "Fraction" $params.fraction | partial "function/content.html" -}}
             {{- end -}}
         {{- end -}}
         {{- $content | replaceRE `<figure[^>]*>.*</figure>` "" | replaceRE `<img[^>]*( /)?>` "" | safeHTML -}}
diff --git a/layouts/partials/rss/item.html b/layouts/partials/rss/item.html
index ea08a6e..3081ee9 100644
--- a/layouts/partials/rss/item.html
+++ b/layouts/partials/rss/item.html
@@ -24,10 +24,10 @@
         {{- end -}}
         {{- $content := .Page.Description -}}
         {{- if $params.rssFullText -}}
-            {{- $content = dict "Content" .Page.Content "Ruby" $params.ruby "Fraction" $params.fraction "Fontawesome" $params.fontawesome | partial "function/content.html" -}}
+            {{- $content = dict "Content" .Page.Content "Ruby" $params.ruby "Fraction" $params.fraction | partial "function/content.html" -}}
         {{- else -}}
             {{- with .Page.Summary -}}
-                {{- $content = dict "Content" . "Ruby" $params.ruby "Fraction" $params.fraction "Fontawesome" $params.fontawesome | partial "function/content.html" -}}
+                {{- $content = dict "Content" . "Ruby" $params.ruby "Fraction" $params.fraction | partial "function/content.html" -}}
             {{- end -}}
         {{- end -}}
         {{- $content | replaceRE `<figure[^>]*>.*</figure>` "" | replaceRE `<img[^>]*( /)?>` "" | safeHTML -}}
diff --git a/layouts/posts/single.html b/layouts/posts/single.html
index c31e83a..83d313a 100644
--- a/layouts/posts/single.html
+++ b/layouts/posts/single.html
@@ -89,22 +89,16 @@
 
         <div class="hero-tags">
             {{ if ne $viewCounter nil}}
-            <span class="rendered" id="views_container"><i class="fas fa-eye fa-fw"></i>&nbsp;<span id="views_value" style="margin-right: 0">{{ if ne $params.Views nil}} {{ $params.Views }} {{ else }} Нет просмотров {{ end }}</span></span>
+            <span class="rendered" id="views_container"><i class="svg-icon icon-eye-big"></i>&nbsp;<span id="views_value" style="margin-right: 0">{{ if ne $params.Views nil}} {{ $params.Views }} {{ else }} Нет просмотров {{ end }}</span></span>
             {{- end -}}
 
             {{- with $.Site.Params.dateformat | default "2006-01-02" | $.PublishDate.Format -}}
             {{- $timeAgoDate:= $.Site.Params.TimeAgo.DateFormat | default "2006-01-02" | $.PublishDate.Format -}}
-            <span id="post-date" class="rendered"><i class="far fa-calendar-alt fa-fw"></i>&nbsp;<time class="timeago" datetime="{{ $timeAgoDate }}">{{ . }}</time></span>
+            <span id="post-date" class="rendered"><i class="svg-icon icon-clock-big"></i>&nbsp;<time class="timeago" datetime="{{ $timeAgoDate }}">{{ . }}</time></span>
             {{- end -}}
 
-            <span class="rendered"><i class="fas fa-pencil-alt fa-fw"></i>&nbsp;{{ T "wordCount" $.WordCount }}</span>
-            <span class="rendered"><i class="far fa-clock fa-fw"></i>&nbsp;{{ T "readingTime" $.ReadingTime }}</span>
-            {{- $comment := $.Scratch.Get "comment" | default dict -}}
-            {{- if $comment.enable | and $comment.valine.enable | and $comment.valine.visitor -}}
-            <span id="{{ .RelPermalink }}" class="leancloud_visitors" data-flag-title="{{ .Title }}">
-                        <i class="far fa-eye fa-fw"></i>&nbsp;<span class=leancloud-visitors-count></span>&nbsp;{{ T "views" }}
-                    </span>&nbsp;
-            {{- end -}}
+            <span class="rendered"><i class="svg-icon icon-pencil-big"></i>&nbsp;{{ T "wordCount" $.WordCount }}</span>
+            <span class="rendered"><i class="svg-icon icon-stopwatch-big"></i>&nbsp;{{ T "readingTime" $.ReadingTime }}</span>
         </div>
         {{ end }}
 
@@ -129,7 +123,7 @@
                             {{- $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>&nbsp;%v</a>` $category.RelPermalink $category.Title) -}}
+                            {{- $categories = $categories | append (printf `<a href="%v"><i class="svg-icon icon-folder"></i>&nbsp;%v</a>` $category.RelPermalink $category.Title) -}}
                             {{- end -}}
                             {{- with delimit $categories "&nbsp;" -}}
                             <span class="post-category">
@@ -138,21 +132,15 @@
                             {{- end -}}
 
                             {{ if ne $viewCounter nil}}
-                            &nbsp;&nbsp;&nbsp;&nbsp;<span id="views_container"><i class="fas fa-eye fa-fw"></i>&nbsp;<span id="views_value" style="margin-right: 0">Нет</span> просмотров</span>
+                            &nbsp;&nbsp;&nbsp;&nbsp;<span id="views_container"><i class="svg-icon icon-eye"></i>&nbsp;<span id="views_value" style="margin-right: 0">Нет</span> просмотров</span>
                             {{- end -}}
 
                             {{- with $.Site.Params.dateformat | default "2006-01-02" | $.PublishDate.Format -}}
                             {{- $timeAgoDate:= $.Site.Params.TimeAgo.DateFormat | default "2006-01-02" | $.PublishDate.Format -}}
-                            &nbsp;&nbsp;&nbsp;&nbsp;<i class="far fa-calendar-alt fa-fw"></i>&nbsp;<time class="timeago" datetime="{{ $timeAgoDate }}">{{ . }}</time>
-                            {{- end -}}
-                            &nbsp;&nbsp;&nbsp;&nbsp;<i class="fas fa-pencil-alt fa-fw"></i>&nbsp;{{ T "wordCount" $.WordCount }}
-                            &nbsp;&nbsp;&nbsp;&nbsp;<i class="far fa-clock fa-fw"></i>&nbsp;{{ T "readingTime" $.ReadingTime }}
-                            {{- $comment := $.Scratch.Get "comment" | default dict -}}
-                            {{- if $comment.enable | and $comment.valine.enable | and $comment.valine.visitor -}}
-                            <span id="{{ .RelPermalink }}" class="leancloud_visitors" data-flag-title="{{ .Title }}">
-                        <i class="far fa-eye fa-fw"></i>&nbsp;<span class=leancloud-visitors-count></span>&nbsp;{{ T "views" }}
-                    </span>&nbsp;
+                            &nbsp;&nbsp;&nbsp;&nbsp;<i class="svg-icon icon-clock"></i>&nbsp;<time class="timeago" datetime="{{ $timeAgoDate }}">{{ . }}</time>
                             {{- end -}}
+                            &nbsp;&nbsp;&nbsp;&nbsp;<i class="svg-icon icon-pencil"></i>&nbsp;{{ T "wordCount" $.WordCount }}
+                            &nbsp;&nbsp;&nbsp;&nbsp;<i class="svg-icon icon-stopwatch"></i>&nbsp;{{ T "readingTime" $.ReadingTime }}
                         </div>
                     </div>
                 </div>
@@ -188,10 +176,9 @@
             <div class="details toc" id="toc-static"  data-kept="{{ if $toc.keepStatic }}true{{ end }}">
                 <div class="details-summary toc-title">
                     <span>{{ T "contents" }}</span>
-                    <span><i class="details-icon fas fa-angle-right"></i></span>
                 </div>
                 <div class="details-content toc-content" id="toc-content-static">
-                    {{- dict "Content" .TableOfContents "Ruby" $params.ruby "Fraction" $params.fraction "Fontawesome" $params.fontawesome | partial "function/content.html" | safeHTML -}}
+                    {{- dict "Content" .TableOfContents "Ruby" $params.ruby "Fraction" $params.fraction | partial "function/content.html" | safeHTML -}}
                 </div>
             </div>
             {{- end -}}
@@ -213,7 +200,7 @@
                 {{- end -}}
                 {{- end -}}
 
-                {{- dict "Content" .Content "Ruby" $params.ruby "Fraction" $params.fraction "Fontawesome" $params.fontawesome | partial "function/content.html" | safeHTML -}}
+                {{- dict "Content" .Content "Ruby" $params.ruby "Fraction" $params.fraction | partial "function/content.html" | safeHTML -}}
 
             {{ $posts := where .Site.RegularPages "Section" "blog"}}
             {{ $related :=  .Site.RegularPages.RelatedIndices . "tags" | first 3 }}
diff --git a/layouts/shortcodes/admonition.html b/layouts/shortcodes/admonition.html
index daa23f7..0ac933d 100644
--- a/layouts/shortcodes/admonition.html
+++ b/layouts/shortcodes/admonition.html
@@ -1,18 +1,18 @@
 {{- $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" "admonition-icon icon-note" -}}
+{{- $iconMap  = dict "abstract" "admonition-icon icon-abstract" | merge $iconMap -}}
+{{- $iconMap  = dict "info" "admonition-icon icon-info" | merge $iconMap -}}
+{{- $iconMap  = dict "tip" "admonition-icon icon-tip" | merge $iconMap -}}
+{{- $iconMap  = dict "success" "admonition-icon icon-success" | merge $iconMap -}}
+{{- $iconMap  = dict "question" "admonition-icon icon-question" | merge $iconMap -}}
+{{- $iconMap  = dict "warning" "admonition-icon icon-warning" | merge $iconMap -}}
+{{- $iconMap  = dict "failure" "admonition-icon icon-failure" | merge $iconMap -}}
+{{- $iconMap  = dict "danger" "admonition-icon icon-danger" | merge $iconMap -}}
+{{- $iconMap  = dict "bug" "admonition-icon icon-bug" | merge $iconMap -}}
+{{- $iconMap  = dict "example" "admonition-icon icon-example" | merge $iconMap -}}
+{{- $iconMap  = dict "quote" "admonition-icon icon-quote" | merge $iconMap -}}
+{{- $iconDetails := "admonition-icon admonition-icon-arrow-right" -}}
 
 {{- if .IsNamedParams -}}
     {{- $type := .Get "type" | default "note" -}}
diff --git a/layouts/taxonomy/list.html b/layouts/taxonomy/list.html
index 4b8342b..e6eb445 100644
--- a/layouts/taxonomy/list.html
+++ b/layouts/taxonomy/list.html
@@ -7,13 +7,7 @@
         {{- /* Title */ -}}
         <h2 class="single-title animated pulse faster">
             {{- $taxonomy := .Data.Singular -}}
-            {{- if eq $taxonomy "category" -}}
-                <i class="far fa-folder-open fa-fw"></i>&nbsp;{{ .Title }}
-            {{- else if eq $taxonomy "tag" -}}
-                <i class="fas fa-tag fa-fw"></i>&nbsp;{{ .Title }}
-            {{- else -}}
-                {{- printf "%v - %v" (T $taxonomy | default $taxonomy) .Title -}}
-            {{- end -}}
+            {{- printf "%v - %v" (T $taxonomy | default $taxonomy) .Title -}}
         </h2>
 
         {{- /* Paginate */ -}}
diff --git a/layouts/taxonomy/terms.html b/layouts/taxonomy/terms.html
index 16fd9f8..75c3aea 100644
--- a/layouts/taxonomy/terms.html
+++ b/layouts/taxonomy/terms.html
@@ -24,7 +24,7 @@
                         <div class="card-item-wrapper">
                             <h3 class="card-item-title">
                                 <a href="{{ .RelPermalink }}">
-                                    <i class="far fa-folder fa-fw"></i>&nbsp;{{ .Page.Title }}
+                                    <i class="svg-icon icon-folder"></i>&nbsp;{{ .Page.Title }}
                                 </a>
                             </h3>
                             {{- range first 5 $pages -}}