diff --git a/core/FrontController.php b/core/FrontController.php
index 780960465e4805c7e5f9706359d1ad43848193b0..40f8f38155b221a23911a360a3ec0d2dc474a8d5 100644
--- a/core/FrontController.php
+++ b/core/FrontController.php
@@ -395,7 +395,7 @@ class FrontController extends Singleton
         } catch (Exception $ex) {
         }
         $logoUrl = $logoUrl ?: 'plugins/Morpheus/images/logo-header.png';
-        $faviconUrl = $faviconUrl ?: 'plugins/CoreHome/images/favicon.ico';
+        $faviconUrl = $faviconUrl ?: 'plugins/CoreHome/images/favicon.png';
 
         $page = file_get_contents(PIWIK_INCLUDE_PATH . '/plugins/Morpheus/templates/maintenance.tpl');
         $page = str_replace('%logoUrl%', $logoUrl, $page);
diff --git a/core/SettingsPiwik.php b/core/SettingsPiwik.php
index f7036dd46a98f9d3c44a2095e794d01f55d9a85e..7a50263e39a085a424b16e95d42073717abc16a3 100644
--- a/core/SettingsPiwik.php
+++ b/core/SettingsPiwik.php
@@ -310,7 +310,7 @@ class SettingsPiwik
             $fetched = "ERROR fetching: " . $e->getMessage();
         }
         // this will match when Piwik not installed yet, or favicon not customised
-        $expectedStringAlt = 'plugins/CoreHome/images/favicon.ico';
+        $expectedStringAlt = 'plugins/CoreHome/images/favicon.png';
 
         // this will match when Piwik is installed and favicon has been customised
         $expectedString = 'misc/user/';
diff --git a/core/testMinimumPhpVersion.php b/core/testMinimumPhpVersion.php
index 82c0375960c3b3a480b3faeeeffad070ce2162b0..8eab5bdf01743dd72d377fc5374e22b48eddd876 100644
--- a/core/testMinimumPhpVersion.php
+++ b/core/testMinimumPhpVersion.php
@@ -127,7 +127,7 @@ if (!function_exists('Piwik_GetErrorMessagePage')) {
         }
 
         if (empty($faviconUrl)) {
-            $faviconUrl = "plugins/CoreHome/images/favicon.ico";
+            $faviconUrl = "plugins/CoreHome/images/favicon.png";
         }
 
         if ($optionalTrace) {
diff --git a/plugins/CoreHome/images/favicon.png b/plugins/CoreHome/images/favicon.png
new file mode 100644
index 0000000000000000000000000000000000000000..9bf27d8b92e274c64d66be60cba1b5e0ed4e8221
Binary files /dev/null and b/plugins/CoreHome/images/favicon.png differ
diff --git a/plugins/CoreHome/templates/_favicon.twig b/plugins/CoreHome/templates/_favicon.twig
index 8464b765791f8b719e5c2ad0076f45d6807157f1..d1fd157ed2c7cbc27150a7cde860baa4d460fae1 100644
--- a/plugins/CoreHome/templates/_favicon.twig
+++ b/plugins/CoreHome/templates/_favicon.twig
@@ -1,5 +1,5 @@
 {% if isCustomLogo and customFavicon is defined and customFavicon %}
     <link rel="shortcut icon" href="{{ customFavicon }}"/>
 {% else %}
-    <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/>
+    <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.png"/>
 {% endif %}
\ No newline at end of file
diff --git a/plugins/Installation/templates/layout.twig b/plugins/Installation/templates/layout.twig
index 41edabf41e2aa6487d37a0774075f5b2adce0a35..438ebec8204e24affa3d26bc125e0d6426bfd36b 100644
--- a/plugins/Installation/templates/layout.twig
+++ b/plugins/Installation/templates/layout.twig
@@ -9,7 +9,7 @@
     <link rel="stylesheet" type="text/css" href="index.php?module=Installation&action=getBaseCss"/>
     <link rel="stylesheet" type="text/css" href="plugins/Installation/stylesheets/installation.css"/>
 
-    <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.ico"/>
+    <link rel="shortcut icon" href="plugins/CoreHome/images/favicon.png"/>
 
     <script type="text/javascript" src="libs/bower_components/jquery/dist/jquery.min.js"></script>
     <script type="text/javascript" src="libs/bower_components/jquery-ui/ui/minified/jquery-ui.min.js"></script>