diff --git a/app/Composers/IndexComposer.php b/app/Composers/IndexComposer.php
index ff9a33f7..9167db7d 100644
--- a/app/Composers/IndexComposer.php
+++ b/app/Composers/IndexComposer.php
@@ -28,7 +28,7 @@ class IndexComposer
         $withData = [
             'systemStatus'  => 'danger',
             'systemMessage' => trans('cachet.service.bad'),
-            'favicon'       => 'favicon',
+            'favicon'       => 'favicon-high-alert',
         ];
 
         if (Component::notStatus(1)->count() === 0) {
@@ -40,15 +40,13 @@ class IndexComposer
                 $withData = [
                     'systemStatus'  => 'success',
                     'systemMessage' => trans('cachet.service.good'),
+                    'favicon'       => 'favicon',
                 ];
             }
-        }
-
-        // Determine favicon to use
-        if (Component::where('status', 4)->count() > 0 || Incident::where('status', 2)->count() > 0) {
-            $withData['favicon'] = 'favicon-high-alert';
-        } elseif (Component::whereIn('status', [2, 3])->count() > 0 || Incident::whereIn('status', [1, 3])->count() > 0) {
-            $withData['favicon'] = 'favicon-medium-alert';
+        } else {
+            if (Component::whereIn('status', [2, 3])->count() > 0) {
+                $withData['favicon'] = 'favicon-medium-alert';
+            }
         }
 
         $view->with($withData);
diff --git a/public/favicon.ico b/public/favicon.ico
index e97d6f61..47abee47 100644
Binary files a/public/favicon.ico and b/public/favicon.ico differ
diff --git a/public/img/favicon-high-alert.ico b/public/img/favicon-high-alert.ico
old mode 100755
new mode 100644
index 4f5d14ec..ab65ff37
Binary files a/public/img/favicon-high-alert.ico and b/public/img/favicon-high-alert.ico differ
diff --git a/public/img/favicon-high-alert.png b/public/img/favicon-high-alert.png
index 42997e06..f9bc18d4 100755
Binary files a/public/img/favicon-high-alert.png and b/public/img/favicon-high-alert.png differ
diff --git a/public/img/favicon-medium-alert.ico b/public/img/favicon-medium-alert.ico
old mode 100755
new mode 100644
index 6b5a6e48..b46220c3
Binary files a/public/img/favicon-medium-alert.ico and b/public/img/favicon-medium-alert.ico differ
diff --git a/public/img/favicon-medium-alert.png b/public/img/favicon-medium-alert.png
index 9e25129c..168b00b9 100755
Binary files a/public/img/favicon-medium-alert.png and b/public/img/favicon-medium-alert.png differ
diff --git a/public/img/favicon.ico b/public/img/favicon.ico
index e97d6f61..47abee47 100644
Binary files a/public/img/favicon.ico and b/public/img/favicon.ico differ