diff --git a/layouts/partials/footer.html b/layouts/partials/footer.html
index c2cb0448..f19a05ba 100644
--- a/layouts/partials/footer.html
+++ b/layouts/partials/footer.html
@@ -18,13 +18,12 @@
       <a class="hover:underline" href="https://git.io/hugo-congo" target="_blank">Congo</a>
     </p>
   {{ end }}
+  {{/* Extend footer - eg. for extra scripts, etc. */}}
+  {{ if templates.Exists "partials/extend-footer.html" }}
+    {{ partialCached "extend-footer.html" . }}
+  {{ end }}
 </footer>
 
-{{/* Extend footer - eg. for extra scripts, etc. */}}
-{{ if templates.Exists "partials/extend-footer.html" }}
-  {{ partialCached "extend-footer.html" . }}
-{{ end }}
-
 {{/* Include mermaid.js only on pages that use the shortcode */}}
 {{- if (in (string .Content) "class=\"mermaid\"") -}}
   <script src="https://unpkg.com/mermaid@8.11.4/dist/mermaid.min.js"></script>
diff --git a/layouts/partials/head.html b/layouts/partials/head.html
index 2026d460..93520d5e 100644
--- a/layouts/partials/head.html
+++ b/layouts/partials/head.html
@@ -29,10 +29,14 @@
     <link type="text/css" rel="stylesheet" href="{{ "css/custom.css" | absURL }}" />
   {{- end }}
   {{/* Icons */}}
-  <link rel="apple-touch-icon" sizes="180x180" href="{{ "/apple-touch-icon.png" | absURL }}" />
-  <link rel="icon" type="image/png" sizes="32x32" href="{{ "/favicon-32x32.png" | absURL }}" />
-  <link rel="icon" type="image/png" sizes="16x16" href="{{ "/favicon-16x16.png" | absURL }}" />
-  <link rel="manifest" href="{{ "/site.webmanifest" | absURL }}" />
+  {{ if templates.Exists "partials/favicons.html" }}
+    {{ partialCached "favicons.html" .Site }}
+  {{ else }}
+    <link rel="apple-touch-icon" sizes="180x180" href="{{ "/apple-touch-icon.png" | absURL }}" />
+    <link rel="icon" type="image/png" sizes="32x32" href="{{ "/favicon-32x32.png" | absURL }}" />
+    <link rel="icon" type="image/png" sizes="16x16" href="{{ "/favicon-16x16.png" | absURL }}" />
+    <link rel="manifest" href="{{ "/site.webmanifest" | absURL }}" />
+  {{ end }}
   {{/* Site Verification */}}
   {{ with .Site.Params.verification.google }}
     <meta name="google-site-verification" content="{{ . }}" />