diff --git a/includes/sys_menu.php b/includes/sys_menu.php
index 2a6da701..bdefaea8 100644
--- a/includes/sys_menu.php
+++ b/includes/sys_menu.php
@@ -27,37 +27,46 @@ function header_toolbar() {
   if (in_array('login', $privileges))
     $toolbar_items[] = toolbar_item_link(page_link_to('login'), 'log-in', login_title(), $p == 'login');
   
-  if(isset($user) && in_array('user_messages', $privileges))
+  if (isset($user) && in_array('user_messages', $privileges))
     $toolbar_items[] = toolbar_item_link(page_link_to('user_messages'), 'envelope', user_unread_messages());
   
   $hints = [];
   if (isset($user)) {
-    if (User_is_freeloader($user))
+    $hint_class = 'info';
+    // Erzengel Hinweis für unbeantwortete Fragen
+    if ($p != "admin_questions") {
+      $new_questions = admin_new_questions();
+      if ($new_questions != "")
+        $hints[] = $new_questions;
+    }
+    
+    $unconfirmed_hint = user_angeltypes_unconfirmed_hint();
+    if ($unconfirmed_hint != '')
+      $hints[] = $unconfirmed_hint;
+    
+    if (User_is_freeloader($user)) {
       $hints[] = error(sprintf(_("You freeloaded at least %s shifts. Shift signup is locked. Please go to heavens desk to be unlocked again."), $max_freeloadable_shifts), true);
-      
-      // Hinweis für Engel, die noch nicht angekommen sind
-    if ($user['Gekommen'] == 0)
+      $hint_class = 'danger';
+    }
+    
+    // Hinweis für Engel, die noch nicht angekommen sind
+    if ($user['Gekommen'] == 0) {
       $hints[] = error(_("You are not marked as arrived. Please go to heaven's desk, get your angel badge and/or tell them that you arrived already."), true);
+      $hint_class = 'danger';
+    }
     
-    if ($enable_tshirt_size && $user['Size'] == "")
+    if ($enable_tshirt_size && $user['Size'] == "") {
       $hints[] = error(_("You need to specify a tshirt size in your settings!"), true);
+      $hint_class = 'danger';
+    }
     
-    if ($user['DECT'] == "")
+    if ($user['DECT'] == "") {
       $hints[] = error(_("You need to specify a DECT phone number in your settings! If you don't have a DECT phone, just enter \"-\"."), true);
-  
-    // Erzengel Hinweis für unbeantwortete Fragen
-    if ($p != "admin_questions") {
-      $new_questions = admin_new_questions();
-     if($new_questions != "")
-       $hints[] = $new_questions; 
+      $hint_class = 'danger';
     }
-  
-    $unconfirmed_hint = user_angeltypes_unconfirmed_hint();
-    if($unconfirmed_hint != '')
-      $hints[] = $unconfirmed_hint;
   }
-  if(count($hints) > 0)
-    $toolbar_items[] = toolbar_popover('warning-sign text-danger', '', $hints, 'bg-danger');
+  if (count($hints) > 0)
+    $toolbar_items[] = toolbar_popover('warning-sign text-' . $hint_class, '', $hints, 'bg-' . $hint_class);
   
   $user_submenu = make_langselect();
   $user_submenu[] = toolbar_item_divider();