diff --git a/_config.yml b/_config.yml
index 7f23533..09b4a8f 100755
--- a/_config.yml
+++ b/_config.yml
@@ -171,7 +171,7 @@ sidebar:
       url: blog/categories/
       rel: nofollow
   - widget: tagcloud
-    icon: fas fa-fire
+    icon: fas fa-tags
     more:
       icon: fas fa-expand-arrows-alt
       url: blog/tags/
diff --git a/layout/_meta/tags.ejs b/layout/_meta/tags.ejs
index 31a6a91..b219bbe 100644
--- a/layout/_meta/tags.ejs
+++ b/layout/_meta/tags.ejs
@@ -2,7 +2,7 @@
   <%
   var items = [];
   post.tags.each(function(item){
-    items.push('<div class="new-meta-item meta-tags"><a class="tag" href="'+url_for(item.path)+'" rel="nofollow"><i class="fas fa-hashtag" aria-hidden="true"></i>&nbsp;<p>' + item.name + '</p></a></div>');
+    items.push('<div class="new-meta-item meta-tags"><a class="tag" href="'+url_for(item.path)+'" rel="nofollow"><i class="fas fa-tag" aria-hidden="true"></i><p>' + item.name + '</p></a></div>');
   });
   %>
   <%- items.join(' ') %>
diff --git a/layout/_partial/article.ejs b/layout/_partial/article.ejs
index ae9ed3d..8b0218c 100755
--- a/layout/_partial/article.ejs
+++ b/layout/_partial/article.ejs
@@ -8,6 +8,7 @@
           <%- post.content %>
         </div>
         <% if(post.layout == 'post'){ %>
+          <br>
           <%- partial('meta', {post: post, position: 'footer'}) %>
         <% } %>
         <% if(post.prev || post.next){ %>
@@ -29,7 +30,7 @@
                                 <%
                                 var items = [];
                                 post.prev.tags.each(function(item){
-                                    items.push('<a class="tag" href="'+url_for(item.path)+'"><i class="fas fa-hashtag fa-fw" aria-hidden="true"></i>' + item.name + '</a>');
+                                    items.push('<a class="tag" href="'+url_for(item.path)+'"><i class="fas fa-tag fa-fw" aria-hidden="true"></i> ' + item.name + '</a>');
                                 });
                                 %>
                                 <h6 class="tags">
@@ -56,7 +57,7 @@
                                 <%
                                 var items = [];
                                 post.next.tags.each(function(item){
-                                    items.push('<a class="tag" href="'+url_for(item.path)+'"><i class="fas fa-hashtag fa-fw" aria-hidden="true"></i>' + item.name + '</a>');
+                                    items.push('<a class="tag" href="'+url_for(item.path)+'"><i class="fas fa-tag fa-fw" aria-hidden="true"></i> ' + item.name + '</a>');
                                 });
                                 %>
                                 <h6 class="tags">
diff --git a/layout/_partial/meta.ejs b/layout/_partial/meta.ejs
index c9c1dcc..3f2ea21 100644
--- a/layout/_partial/meta.ejs
+++ b/layout/_partial/meta.ejs
@@ -50,7 +50,7 @@ if (post.meta && (post.meta.footer !== undefined && post.meta.footer !== null))
   </section>
 <% } else if (position == 'footer') { %>
   <section class='meta' id="footer-meta">
-    <hr>
+
     <div class='new-meta-box'>
       <% (bottomMetas).forEach(function(meta){ %>
         <% if(meta != 'title'){ %>
diff --git a/layout/_partial/post.ejs b/layout/_partial/post.ejs
index 428bbd0..e56d708 100755
--- a/layout/_partial/post.ejs
+++ b/layout/_partial/post.ejs
@@ -15,7 +15,7 @@
     <% if (post.tags && post.tags.length) { %>
       <div class="full-width auto-padding tags">
         <% post.tags.each(function(item){ %>
-          <a href="<%- url_for(item.path) %>" rel="nofollow"><i class="fas fa-hashtag fa-fw"></i><%=item.name %></a>
+          <a href="<%- url_for(item.path) %>" rel="nofollow"><i class="fas fa-tag fa-fw"></i> <%=item.name %></a>
         <%})%>
       </div>
     <% } %>
diff --git a/layout/_widget/tagcloud.ejs b/layout/_widget/tagcloud.ejs
index 0a6ab7f..ed37435 100755
--- a/layout/_widget/tagcloud.ejs
+++ b/layout/_widget/tagcloud.ejs
@@ -1,6 +1,6 @@
 <% if (site.tags.length){ %>
   <section class='widget <%- item.widget %>'>
-    <%- partial('header', {item: item, defIcon: 'fas fa-fire', defTitle: __('sidebar.tagcloud')}) %>
+    <%- partial('header', {item: item, defIcon: 'fas fa-tags', defTitle: __('sidebar.tagcloud')}) %>
     <div class='content <%= theme.style %>'>
       <%- tagcloud(site.tags, {
           min_font: 14,
diff --git a/layout/links.ejs b/layout/links.ejs
index de964aa..9d3afde 100755
--- a/layout/links.ejs
+++ b/layout/links.ejs
@@ -7,12 +7,13 @@
             <% if(group.items) { %>
               <div class='friends-group'>
                 <% if(group.group) { %>
-                  <h2 class='friend-header'>
+                  <br>
+                  <h3 class='friend-header'>
                     <% if (group.icon) { %>
                       <i class="<%= group.icon %> fa-fw" aria-hidden="true"></i>
                     <%} %>
                     <%= group.group %>
-                  </h2>
+                  </h3>
                 <%} %>
                 <div class='friend-content'>
                   <% (group.items||[]).forEach(function(item){ %>
@@ -38,7 +39,7 @@
             <%} %>
           <% }) %>
         <% } %>
-        <br><hr>
+        <br><br>
         <%- page.content %>
       </section>
   </article>
diff --git a/layout/tag.ejs b/layout/tag.ejs
index 7c62c10..f928c1a 100755
--- a/layout/tag.ejs
+++ b/layout/tag.ejs
@@ -15,7 +15,7 @@
                   <% site.tags.sort('path').each(function(tags){ %>
                     <% if (tags.posts.length){ %>
                       <a class="<%= tags.parent ? ' child' : ''%>" href="<%= url_for(tags.path) %>">
-                        <time><i class='fas fa-hashtag fa-fw' aria-hidden="true"></i>&nbsp;&nbsp;<%= tags.name %></time>
+                        <time><i class='fas fa-tag fa-fw' aria-hidden="true"></i>&nbsp;&nbsp;<%= tags.name %></time>
                         <span class="title">
                           (<%- tags.posts.length %>)
                         </span>