diff --git a/layouts/partials/favicon.html b/layouts/partials/favicon.html
index 0d6bbe3161..ffb20f71f2 100644
--- a/layouts/partials/favicon.html
+++ b/layouts/partials/favicon.html
@@ -1,26 +1,46 @@
     {{- $assetBusting := not .Site.Params.disableAssetsBusting }}
-    {{- if or (fileExists "/static/images/favicon-light.svg") (fileExists "/static/images/favicon-dark.svg") }}
+    {{- $faviconMatch := false }}
+    {{- $svg := dict "ext" "svg" "type" "image/svg+xml" }}
+    {{- $png := dict "ext" "png" "type" "image/png" }}
+    {{- $ico := dict "ext" "ico" "type" "image/x-icon" }}
+    {{- $faviconTypes := slice $svg $png $ico }}
+    {{- range $faviconTypes }}
+    {{- if and
+      (eq $faviconMatch false)
+      (or
+        (fileExists (printf "/static/images/favicon-light.%s" .ext))
+        (fileExists (printf "/static/images/favicon-dark.%s"))
+      )
+    }}
+    {{- $faviconMatch = true }}
     {{/*
       Warning: IE and old browser versions do not support media queries necessary for the light & dark theme option.
       If you have requirements to support IE and/or older browser versions, use one of the other options.
       Reference: https://caniuse.com/css-media-interaction
     */}}
-    {{- if (fileExists "/static/images/favicon-light.svg") }}
-    <link href="{{ "images/favicon-light.svg" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="icon" type="image/svg+xml" media="(prefers-color-scheme: light)">
+    {{- if (fileExists (printf "/static/images/favicon-light.%s" .ext)) }}
+    <link href="{{ printf "images/favicon-light.%s" .ext | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="icon" type="{{ .type }}" media="(prefers-color-scheme: light)">
     {{- end }}
-    {{- if (fileExists "/static/images/favicon-dark.svg") }}
-    <link href="{{ "images/favicon-dark.svg" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="icon" type="image/svg+xml" media="(prefers-color-scheme: dark)">
+    {{- if (fileExists (printf "/static/images/favicon-dark.%s" .ext)) }}
+    <link href="{{ printf "images/favicon-dark.%s" .ext | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="icon" type="{{ .type }}" media="(prefers-color-scheme: dark)">
+    {{- end }}
+    {{- end }}
+    {{- end }}
+    {{- range $faviconTypes }}
+    {{- if and
+      (eq $faviconMatch false)
+      (fileExists (printf "/static/images/favicon.%s" .ext))
+    }}
+    {{- $faviconMatch = true }}
+    <link href="{{ printf "images/favicon.%s" .ext | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="icon" type="{{ .type }}">
+    {{- end }}
+    {{- end }}
+    {{- range $faviconTypes }}
+    {{- if and
+      (eq $faviconMatch false)
+      (fileExists (printf "/static/images/logo.%s" .ext))
+    }}
+    {{- $faviconMatch := true }}
+    <link href="{{ printf "images/logo.%s" .ext | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="icon" type="{{ .type }}">
     {{- end }}
-    {{- else if (fileExists "/static/images/favicon.svg") }}
-    <link href="{{ "images/favicon.svg" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="icon" type="image/svg+xml">
-    {{- else if (fileExists "/static/images/favicon.png") }}
-    <link href="{{ "images/favicon.png" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="icon" type="image/png">
-    {{- else if (fileExists "/static/images/favicon.ico") }}
-    <link href="{{ "images/favicon.ico" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="icon" type="image/x-icon">
-    {{- else if (fileExists "/static/images/logo.svg") }}
-    <link href="{{ "images/logo.svg" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="icon" type="image/svg+xml">
-    {{- else if (fileExists "/static/images/logo.png") }}
-    <link href="{{ "images/logo.png" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="icon" type="image/png">
-    {{- else if (fileExists "/static/images/logo.ico") }}
-    <link href="{{ "images/logo.ico" | relURL }}{{ if $assetBusting }}?{{ now.Unix }}{{ end }}" rel="icon" type="image/x-icon">
     {{- end }}
\ No newline at end of file