Merge pull request #1959 from asaadmahmoodspin/ui-improvements

Updating favicon stuff

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">
 

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');