diff --git a/templates/index.html b/templates/index.html
index 2145dff..83ed53d 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -18,16 +18,17 @@
             {%- if feed is containing('atom') %}
                 <link rel="alternate" type="application/atom+xml" title="{{ config.title }} Atom Feed" href="{{ get_url(path=feed, trailing_slash=false, lang=lang) | safe }}" />
             {%- endif %}
+
             {%- if feed is containing('rss') %}
                 <link rel="alternate" type="application/rss+xml" title="{{ config.title }} RSS Feed" href="{{ get_url(path=feed, trailing_slash=false, lang=lang) | safe }}" />
             {%- endif %}
-        {%- endfor %}
-    {% endif -%}
 
-    {# Favicon #}
-    {% if config.extra.favicon %}
-        <link rel="icon" type="image/png" href={{ config.extra.favicon }} />
-    {% endif %}
+        {%- endfor %}
+    {%- endif -%}
+
+    {%- if config.extra.favicon %}
+        <link rel="shortcut icon" type="{{ config.extra.favicon_mimetype | default(value="image/x-icon") | safe }}" href="{{ config.extra.favicon | safe }}">
+    {% endif -%}
 
     {%- block extra_head %}
     {% endblock extra_head -%}