diff --git a/html/includes/print-menubar.php b/html/includes/print-menubar.php
index 725bf2b70c..c21fe97f92 100644
--- a/html/includes/print-menubar.php
+++ b/html/includes/print-menubar.php
@@ -626,7 +626,7 @@ if (empty($notifications['count']) && empty($notifications['sticky_count'])) {
 } else {
     $class = 'badge-danger';
 }
-    echo('<a href="#" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-user fa-fw fa-lg fa-nav-icons" aria-hidden="true"></i> <span class="visible-xs-inline-block">User</span><span class="badge badge-navbar-user '.$class.'">'.($notifications['sticky_count']+$notifications['count']).'</span></a>');
+    echo('<a href="#" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-user fa-fw fa-lg fa-nav-icons" aria-hidden="true"></i> <span class="visible-xs-inline-block">User</span><span class="badge badge-navbar-user count-notif '.$class.'">'.($notifications['sticky_count']+$notifications['count']).'</span></a>');
 ?>
         <ul class="dropdown-menu">
           <li><a href="preferences/"><i class="fa fa-cog fa-fw fa-lg" aria-hidden="true"></i> My Settings</a></li>
diff --git a/html/pages/notifications.inc.php b/html/pages/notifications.inc.php
index 5f65d81b18..77216f2371 100644
--- a/html/pages/notifications.inc.php
+++ b/html/pages/notifications.inc.php
@@ -221,7 +221,14 @@ $(function() {
           $("#message").html('<div class="alert alert-info">' + data.message + '</div>');
           $("#"+notif).parent().parent().parent().fadeOut();
           $(".count-notif").each(function(){
-            this.innerHTML = this.innerHTML-1;
+              var new_count = this.innerHTML-1;
+              this.innerHTML = new_count;
+              if (new_count == 0) {
+                  $this = $(this);
+                  if ($this.hasClass('badge-danger')) {
+                      $this.removeClass('badge-danger');
+                  }
+              }
           });
         }
         else {