diff --git a/UI/Templates/MailerUI/UIxMailMainFrame.wox b/UI/Templates/MailerUI/UIxMailMainFrame.wox
index 137e7d8ee..ef8cb9ee0 100644
--- a/UI/Templates/MailerUI/UIxMailMainFrame.wox
+++ b/UI/Templates/MailerUI/UIxMailMainFrame.wox
@@ -258,7 +258,7 @@
               <p class="sg-item-name"
                  ng-show="app.editMode != folder.path">
                 {{app.metadataForFolder(folder).name}}
-                <span class="sg-unread-badge" ng-show="folder.unseenCount">{{folder.unseenCount}}</span>
+                <span class="sg-counter-badge" ng-show="folder.unseenCount">{{folder.unseenCount}}</span>
               </p>
               <md-input-container class="md-flex"
                                   ng-show="app.editMode == folder.path">
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index cfc75f487..c4d331162 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -170,7 +170,10 @@
                            ng-true-value="1"
                            ng-false-value="0"
                            label:aria-label="Enable"><!-- enable --></md-checkbox>
-              <p class="sg-item-name" ng-show="app.editMode != calendar.id">{{calendar.name}}</p>
+              <p class="sg-item-name" ng-show="app.editMode != calendar.id">
+                {{calendar.name}}
+                <span class="sg-counter-badge" ng-show="calendar.activeTasks">{{calendar.activeTasks}}</span>
+              </p>
               <md-input-container class="md-flex"
                                   ng-show="app.editMode == calendar.id">
                 <input class="sg-item-name" type="text"
diff --git a/UI/WebServerResources/scss/components/list/list.scss b/UI/WebServerResources/scss/components/list/list.scss
index 200845c6b..c0d7859d1 100644
--- a/UI/WebServerResources/scss/components/list/list.scss
+++ b/UI/WebServerResources/scss/components/list/list.scss
@@ -129,6 +129,17 @@ div.md-tile-left {
     width: (2 * $mg);
     height:(7 * $line);
   }
+
+  &-counter-badge {
+    border-left-width: 1px;
+    border-left-color: #999;
+    border-style: solid;
+    margin: 0;
+    padding: 0 rem(0.500);
+    font-size: $sg-font-size-1;
+    font-weight: $sg-font-medium;
+    text-transform: uppercase;
+  }
 }
 .sg-avatars {
   margin: ($mg / 2) 0 0 ($mg / 2);
diff --git a/UI/WebServerResources/scss/views/MailerUI.scss b/UI/WebServerResources/scss/views/MailerUI.scss
index 7bb7bddac..7ae8b853e 100644
--- a/UI/WebServerResources/scss/views/MailerUI.scss
+++ b/UI/WebServerResources/scss/views/MailerUI.scss
@@ -11,17 +11,6 @@
   transform: translateY(-100%); // Compensate the container top-margin
 }
 
-.sg-unread-badge {
-  border-left-width: 1px;
-  border-left-color: #999;
-  border-style: solid;
-  margin: 0;
-  padding: 0 rem(0.500);
-  font-size: $sg-font-size-1;
-  font-weight: $sg-font-medium;
-  text-transform: uppercase;
-}
-
 .unread {
   .#{$md}-subhead-multi,
   .#{$md}-body-multi {