diff --git a/modoboa/static/css/favicon.ico b/modoboa/static/css/favicon.ico
new file mode 100644
index 000000000..985be6b03
Binary files /dev/null and b/modoboa/static/css/favicon.ico differ
diff --git a/modoboa/static/css/logo-icon.png b/modoboa/static/css/logo-icon.png
deleted file mode 100644
index 859251fe0..000000000
Binary files a/modoboa/static/css/logo-icon.png and /dev/null differ
diff --git a/modoboa/templates/layout_simple.html b/modoboa/templates/layout_simple.html
index f0378811e..4a9ebc701 100644
--- a/modoboa/templates/layout_simple.html
+++ b/modoboa/templates/layout_simple.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <title>{% block pagetitle %}{% endblock %}</title>
-    <link rel="icon" type="image/png" href="{% static 'css/logo-icon.png' %}" />
+    <link rel="icon" type="image/x-icon" href="{% static 'css/favicon.ico' %}" />
     <link rel="stylesheet" type="text/css" href="{% static 'css/offline.css' %}" />
   </head>
 
diff --git a/modoboa/templates/registration/base.html b/modoboa/templates/registration/base.html
index 12feed341..bc41ca789 100644
--- a/modoboa/templates/registration/base.html
+++ b/modoboa/templates/registration/base.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <meta http-equiv="X-UA-Compatible" content="IE=edge" />
     <title>{% trans "Welcome to Modoboa" %}</title>
-    <link rel="icon" type="image/png" href="{% static 'css/logo-icon.png' %}" />
+    <link rel="icon" type="image/x-icon" href="{% static 'css/favicon.ico' %}" />
     <link rel="stylesheet" type="text/css" href="{% static 'css/offline.css' %}" />
     {% block extra_css %}{% endblock %}
   </head>