diff --git a/api/templates/error.html b/api/templates/error.html
index 6944f6c680..9fb2da1bae 100644
--- a/api/templates/error.html
+++ b/api/templates/error.html
@@ -11,8 +11,8 @@
     <script src="/static/js/bootstrap-3.3.5.min.js"></script>
     <script src="/static/js/react-bootstrap-0.25.1.min.js"></script>
 
-    <link id="favicon" rel="icon" href="/static/images/favicon.ico" type="image/x-icon">
-    <link rel="shortcut icon" href="/static/images/favicon.ico" type="image/x-icon">
+    <link id="favicon" rel="icon" href="/static/images/favicon/favicon-16x16.png" type="image/x-icon">
+    <link rel="shortcut icon" href="/static/images/favicon/favicon-16x16.png" type="image/x-icon">
     <link href='/static/css/google-fonts.css' rel='stylesheet' type='text/css'>
     <link rel="stylesheet" href="/static/css/styles.css">
 
diff --git a/web/react/components/sidebar.jsx b/web/react/components/sidebar.jsx
index eaeb7bb91a..c902731c94 100644
--- a/web/react/components/sidebar.jsx
+++ b/web/react/components/sidebar.jsx
@@ -506,9 +506,9 @@ export default class Sidebar extends React.Component {
         link.rel = 'shortcut icon';
         link.id = 'favicon';
         if (this.badgesActive) {
-            link.href = '/static/images/redfavicon.ico';
+            link.href = '/static/images/favicon/redfavicon-16x16.png';
         } else {
-            link.href = '/static/images/favicon.ico';
+            link.href = '/static/images/favicon/favicon-16x16.png';
         }
         var head = document.getElementsByTagName('head')[0];
         var oldLink = document.getElementById('favicon');
diff --git a/web/static/images/favicon/redfavicon-16x16.png b/web/static/images/favicon/redfavicon-16x16.png
new file mode 100644
index 0000000000..9645113ef0
Binary files /dev/null and b/web/static/images/favicon/redfavicon-16x16.png differ