diff --git a/layout/_partials/header/menu-item.njk b/layout/_partials/header/menu-item.njk
index b5adab9..4513eb3 100644
--- a/layout/_partials/header/menu-item.njk
+++ b/layout/_partials/header/menu-item.njk
@@ -6,10 +6,7 @@
   {%- endif %}
   <li class="menu-item menu-item-{{ itemName | replace(' ', '-') }}">
 
-    {%- set menuIcon = '' %}
-    {%- if theme.menu_settings.icons %}
-      {%- set menuIcon = '<i class="' + value.split('||')[1] | trim + ' fa-fw"></i>' %}
-    {%- endif %}
+    {%- set menuIcon = '<i class="' + value.split('||')[1] | trim + ' fa-fw"></i>' if theme.menu_settings.icons and value.split('||')[1] else '' %}
     {%- set menuText = __('menu.' + name) | replace('menu.', '') %}
 
     {%- set menuBadge = '' %}
diff --git a/layout/_partials/page/breadcrumb.njk b/layout/_partials/page/breadcrumb.njk
index 4405b65..3e8d769 100644
--- a/layout/_partials/page/breadcrumb.njk
+++ b/layout/_partials/page/breadcrumb.njk
@@ -8,11 +8,7 @@
         {%- if loop.index == count - 1 and paths[loop.index] == 'index.html' %}
           <li>{{ path | upper }}</li>
         {% else %}
-          {%- if link == '' %}
-            {%- set link = '/' + path %}
-          {% else %}
-            {%- set link = link + '/' + path %}
-          {%- endif %}
+          {%- set link = '/' + path if link == '' else link + '/' + path %}
           {%- if path.endsWith('.html') %}
             <li>{{ path | replace(r/\.html$/, '') | upper }}</li>
           {% else %}
diff --git a/layout/_partials/post/post-followme.njk b/layout/_partials/post/post-followme.njk
index a3a9414..2af838f 100644
--- a/layout/_partials/post/post-followme.njk
+++ b/layout/_partials/post/post-followme.njk
@@ -6,7 +6,7 @@
     <div class="social-list">
       {%- for name, value in theme.follow_me %}
         {%- set link = value.split('||')[0] | trim %}
-        {%- set icon = value.split('||')[1] | trim %}
+        {%- set icon = value.split('||')[1] | trim if value.split('||')[1] else '' %}
 
         <div class="social-item">
           <a target="_blank" class="social-link" href="{{ link }}">
diff --git a/layout/_partials/sidebar/site-overview.njk b/layout/_partials/sidebar/site-overview.njk
index d1a7c7f..73fa566 100644
--- a/layout/_partials/sidebar/site-overview.njk
+++ b/layout/_partials/sidebar/site-overview.njk
@@ -79,7 +79,7 @@
     {%- for name, link in theme.social %}
       <span class="links-of-author-item">
         {%- set sidebarURL = link.split('||')[0] | trim %}
-        {%- set sidebarIcon = '<i class="' + link.split('||')[1] | trim + ' fa-fw"></i>' if theme.social_icons.enable else '' %}
+        {%- set sidebarIcon = '<i class="' + link.split('||')[1] | trim + ' fa-fw"></i>' if theme.social_icons.enable and link.split('||')[1] else '' %}
         {%- set sidebarText = '' if (theme.social_icons.enable and theme.social_icons.icons_only) else name %}
         {{ next_url(sidebarURL, sidebarIcon + sidebarText, {title: name + ' → ' + sidebarURL}) }}
       </span>