diff --git a/templates/article.html b/templates/article.html
index 8900367..44208e9 100644
--- a/templates/article.html
+++ b/templates/article.html
@@ -1,6 +1,23 @@
 {% extends "base.html" %}
 {% block title %}{{ article.title }}{% endblock %}
 
+{# <!-- Choosing cover image --> #}
+{% if article.cover %}
+    {% if article.cover|lower|truncate(4, True, '') == "http" %}
+        {% set default_cover = article.cover %}
+    {% else %}
+        {% set default_cover = SITEURL+"/"+article.cover %}
+    {% endif %}
+{% elif article.og_image %}
+    {% if article.og_image|lower|truncate(4, True, '') == "http" %}
+        {% set default_cover = article.og_image %}
+    {% else %}
+        {% set default_cover = SITEURL+"/"+article.og_image %}
+    {% endif %}
+{% elif HEADER_COVER %}
+  {% set default_cover = SITEURL+"/"+HEADER_COVER %}
+{% endif %}
+
 {% block head %}
     {{ super() }}
 
@@ -67,18 +84,16 @@
         <!-- TODO : Modified check -->
         {% if article.modified %}
             <span class="post-meta"> | Updated on {{ article.locale_modified }}</span>
-        {% endif %}        
-        {% if article.header_cover %}
-            <div class="post-cover cover" style="background-image: url('{{ article.header_cover }}')">
-        {% elif HEADER_COVER %}
-            <div class="post-cover cover" style="background-image: url('{{ HEADER_COVER }}')">            
+        {% endif %}
+        {% if default_cover %}
+            <div class="post-cover cover" style="background-image: url('{{ default_cover }}')">
         {% elif HEADER_COLOR %}
             <div class="post-cover cover" style="background-color: {{ HEADER_COLOR }}">
         {% else %}
             <div class="post-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
-        {% endif %}        
+        {% endif %}
       </div>
-    </header>    
+    </header>
 {% endblock header %}
 
 {% block content %}
diff --git a/templates/page.html b/templates/page.html
index 408739f..980c483 100644
--- a/templates/page.html
+++ b/templates/page.html
@@ -2,6 +2,23 @@
 
 {% block title %}{{ page.title }}{% endblock title %}
 
+{# <!-- Choosing cover image --> #}
+{% if page.cover %}
+    {% if page.cover|lower|truncate(4, True, '') == "http" %}
+        {% set default_cover = page.cover %}
+    {% else %}
+        {% set default_cover = SITEURL+"/"+page.cover %}
+    {% endif %}
+{% elif page.og_image %}
+    {% if page.og_image|lower|truncate(4, True, '') == "http" %}
+        {% set default_cover = page.og_image %}
+    {% else %}
+        {% set default_cover = SITEURL+"/"+page.og_image %}
+    {% endif %}
+{% elif HEADER_COVER %}
+  {% set default_cover = SITEURL+"/"+HEADER_COVER %}
+{% endif %}
+
 {% block header %}
     <!-- Page Header -->
     <!-- Set your background image for this header on the line below. -->
@@ -22,17 +39,15 @@
           </span>
         </nav>
         <h1 class="post-title">{{ page.title }}</h1>
-        {% if page.og_image %}
-            <div class="post-cover cover" style="background-image: url('{{ page.og_image }}')">
-        {% elif HEADER_COVER %}
-            <div class="post-cover cover" style="background-image: url('{{ HEADER_COVER }}')">
+        {% if default_cover %}
+            <div class="post-cover cover" style="background-image: url('{{ default_cover }}')">
         {% elif HEADER_COLOR %}
             <div class="post-cover cover" style="background-color: {{ HEADER_COLOR }}">
         {% else %}
             <div class="post-cover cover" style="background-image: url('{{ SITEURL }}/{{ THEME_STATIC_DIR }}/images/post-bg.jpg')">
-        {% endif %}        
+        {% endif %}
       </div>
-    </header>    
+    </header>
 {% endblock header %}
 
 {% block content %}
diff --git a/templates/partials/jsonld_article.html b/templates/partials/jsonld_article.html
index 642310d..d80d9f0 100644
--- a/templates/partials/jsonld_article.html
+++ b/templates/partials/jsonld_article.html
@@ -1,16 +1,16 @@
 {# <!-- Choosing cover image --> #}
 {% if article.og_image %}
     {% if article.og_image|lower|truncate(4, True, '') == "http" %}
-        set default_cover = article.og_image
+        {% set default_cover = article.og_image %}
     {% else %}
-        set default_cover = SITEURL+"/"+article.og_image
+        {% set default_cover = SITEURL+"/"+article.og_image %}
     {% endif %}
 {% elif article.cover %}
     {% if article.cover|lower|truncate(4, True, '') == "http" %}
-        set default_cover = article.cover
+        {% set default_cover = article.cover %}
     {% else %}
-        set default_cover = SITEURL+"/"+article.cover
-    {% endif %}    
+        {% set default_cover = SITEURL+"/"+article.cover %}
+    {% endif %}
 {% elif HEADER_COVER %}
   {% set default_cover = SITEURL+"/"+HEADER_COVER %}
 {% else %}
diff --git a/templates/partials/og_article.html b/templates/partials/og_article.html
index 820c03b..a809936 100644
--- a/templates/partials/og_article.html
+++ b/templates/partials/og_article.html
@@ -8,16 +8,16 @@
 {# <!-- Choosing cover image --> #}
 {% if article.og_image %}
     {% if article.og_image|lower|truncate(4, True, '') == "http" %}
-        set default_cover = article.og_image
+        {% set default_cover = article.og_image %}
     {% else %}
-        set default_cover = SITEURL+"/"+article.og_image
+        {% set default_cover = SITEURL+"/"+article.og_image %}
     {% endif %}
 {% elif article.cover %}
     {% if article.cover|lower|truncate(4, True, '') == "http" %}
-        set default_cover = article.cover
+        {% set default_cover = article.cover %}
     {% else %}
-        set default_cover = SITEURL+"/"+article.cover
-    {% endif %}    
+        {% set default_cover = SITEURL+"/"+article.cover %}
+    {% endif %}
 {% elif HEADER_COVER %}
   {% set default_cover = SITEURL+"/"+HEADER_COVER %}
 {% else %}