diff --git a/templates/default.html.twig b/templates/default.html.twig
index 14be3cc..08b63db 100755
--- a/templates/default.html.twig
+++ b/templates/default.html.twig
@@ -27,7 +27,7 @@
 
   {% if show_sidebar == false %}
     <section id="footer" class="align-center">
-      {% include 'partials/footer.html.twig' %}
+      {% include 'partials/sidebar-bits/footer.html.twig' %}
     </section>
   {% endif %}
 {% endblock %}
diff --git a/templates/error.html.twig b/templates/error.html.twig
old mode 100644
new mode 100755
index 7fa7ba4..1203683
--- a/templates/error.html.twig
+++ b/templates/error.html.twig
@@ -18,7 +18,7 @@
 
   {% if sidebar == false %}
     <section id="footer" class="align-center">
-      {% include 'partials/footer.html.twig' %}
+      {% include 'partials/sidebar-bits/footer.html.twig' %}
     </section>
   {% endif %}
 {% endblock %}
diff --git a/templates/offline.html.twig b/templates/offline.html.twig
index 25315f5..548aad3 100755
--- a/templates/offline.html.twig
+++ b/templates/offline.html.twig
@@ -15,7 +15,7 @@
 
   {% if sidebar == false %}
     <section id="footer" class="align-center">
-      {% include 'partials/footer.html.twig' %}
+      {% include 'partials/sidebar-bits/footer.html.twig' %}
     </section>
   {% endif %}
   
diff --git a/templates/partials/simplesearch_item.html.twig b/templates/partials/simplesearch_item.html.twig
index 5cb59b5..7b444f6 100755
--- a/templates/partials/simplesearch_item.html.twig
+++ b/templates/partials/simplesearch_item.html.twig
@@ -1,7 +1,7 @@
 <section class="search-row">
 
     {% set title = page.title %}
-    {% set thumb = page.media[page.header.primaryImage] ?: page.media.images|first %}   
+    {% set thumb = page.media[page.header.primaryImage] ?: page.media.all|filter((v, k) => k != page.header.avatarImage and (v.type == 'image' or v.type == 'vector'))|first %}
 
     {% if thumb %}
     <div class="search-image">
diff --git a/templates/portfolio.html.twig b/templates/portfolio.html.twig
index 8cabd46..3cbbea6 100755
--- a/templates/portfolio.html.twig
+++ b/templates/portfolio.html.twig
@@ -66,7 +66,7 @@
 
 	{% if show_sidebar == false %}
 		<section id="footer" class="align-center">
-			{% include 'partials/footer.html.twig' %}
+			{% include 'partials/sidebar-bits/footer.html.twig' %}
 		</section>
 	{% endif %}
 {% endblock %}
diff --git a/templates/simplesearch_results.html.twig b/templates/simplesearch_results.html.twig
index 0f4282c..38ac9ce 100755
--- a/templates/simplesearch_results.html.twig
+++ b/templates/simplesearch_results.html.twig
@@ -37,7 +37,7 @@
 
   {% if sidebar == false %}
     <section id="footer" class="align-center">
-      {% include 'partials/footer.html.twig' %}
+      {% include 'partials/sidebar-bits/footer.html.twig' %}
     </section>
   {% endif %}
 {% endblock %}