diff --git a/UI/Templates/ContactsUI/UIxContactFoldersView.wox b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
index 01b4f7172..056b1d7fd 100644
--- a/UI/Templates/ContactsUI/UIxContactFoldersView.wox
+++ b/UI/Templates/ContactsUI/UIxContactFoldersView.wox
@@ -354,7 +354,7 @@
 
         <md-content id="contactsList" layout="column" class="md-flex">
           <md-subheader ng-show="addressbook.service.$query.value">
-            <md-button class="md-icon-button md-primary hide show-gt-sm" ng-click="toggleLeft()">
+            <md-button class="md-icon-button hide show-gt-sm" ng-click="toggleLeft()">
               <md-icon ng-class="{'md-rotate-180': leftIsClose }">keyboard_arrow_left</md-icon>
             </md-button>
             <span ng-switch="addressbook.selectedFolder.cards.length">
@@ -363,7 +363,7 @@
             </span>
           </md-subheader>
           <md-subheader ng-hide="addressbook.service.$query.value">
-            <md-button class="md-icon-button md-primary hide show-gt-sm" ng-click="toggleLeft()">
+            <md-button class="md-icon-button hide show-gt-sm" ng-click="toggleLeft()">
               <md-icon ng-class="{'md-rotate-180': leftIsClose }">keyboard_arrow_left</md-icon>
             </md-button>
             <span ng-switch="addressbook.selectedFolder.isRemote">
diff --git a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
index a648e55a5..3db998892 100644
--- a/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
+++ b/UI/Templates/MailerUI/UIxMailFolderTemplate.wox
@@ -202,9 +202,11 @@
 
     <md-content id="messagesList" layout="column" class="md-flex">
       <md-subheader>
-        <md-button class="md-icon-button md-primary hide show-gt-sm" ng-click="toggleLeft()">
+        <!-- toggle sidenav -->
+        <md-button class="md-icon-button hide show-gt-sm" ng-click="toggleLeft()">
           <md-icon ng-class="{'md-rotate-180': leftIsClose }">keyboard_arrow_left</md-icon>
         </md-button>
+        <!-- message count -->
         <span ng-switch="mailbox.service.selectedFolder.getLength()">
           <span ng-switch-when="0"><var:string label:value="No message"/></span>
           <span ng-switch-default="true">{{mailbox.service.selectedFolder.getLength()}} <var:string label:value="messages"/></span>
diff --git a/UI/Templates/SchedulerUI/UIxCalMainView.wox b/UI/Templates/SchedulerUI/UIxCalMainView.wox
index 3bb7d2e6f..895157e70 100644
--- a/UI/Templates/SchedulerUI/UIxCalMainView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMainView.wox
@@ -582,6 +582,12 @@
             <!-- Events list -->
             <md-tab label:label="Events"
                     md-on-select="list.selectComponentType('events')">
+              <md-subheader>
+                <md-button class="md-icon-button hide show-gt-sm" ng-click="toggleLeft()">
+                  <md-icon ng-class="{'md-rotate-180': leftIsClose }">keyboard_arrow_left</md-icon>
+                </md-button>
+                <span>{{list.component.$queryEvents.filterpopup | loc}}</span>
+              </md-subheader>
               <md-list class="sg-section-list">
                 <md-list-item ng-repeat="event in list.component.$events"
                               ng-click="list.openEvent($event, event)">
@@ -619,6 +625,12 @@
             <!-- Tasks list -->
             <md-tab label:label="Tasks"
                     md-on-select="list.selectComponentType('tasks')">
+              <md-subheader>
+                <md-button class="md-icon-button hide show-gt-sm" ng-click="toggleLeft()">
+                  <md-icon ng-class="{'md-rotate-180': leftIsClose }">keyboard_arrow_left</md-icon>
+                </md-button>
+                <span>{{list.component.$queryTasks.filterpopup | loc}}</span>
+              </md-subheader>
               <md-list class="sg-section-list">
                 <md-list-item ng-repeat="task in list.component.$tasks"
                               ng-click="list.openTask($event, task)">
diff --git a/UI/WebServerResources/scss/components/button/button.scss b/UI/WebServerResources/scss/components/button/button.scss
index 65dba43d8..391a81e53 100644
--- a/UI/WebServerResources/scss/components/button/button.scss
+++ b/UI/WebServerResources/scss/components/button/button.scss
@@ -68,6 +68,21 @@ md-list md-list-item button.md-button.sg-icon-button {
   }
 }
 
+.md-subheader-content {
+  .md-icon-button:first-child {
+    padding-left: 0;
+    margin-left: $icon-button-margin/2;
+    margin-right: $icon-button-margin*1.5;
+  }
+}
+md-tab-content {
+  .md-subheader-content {
+    .md-icon-button:first-child {
+      margin-right: $icon-button-margin/2;
+    }
+  }
+}
+
 // md-toolbar .md-toolbar-tools:first-of-type .iconButton,
 // md-toolbar .md-toolbar-tools:first-child .iconButton,
 // md-toolbar .md-toolbar-tools.md-toolbar-tools-top .iconButton,
diff --git a/UI/WebServerResources/scss/components/subheader/subheader.scss b/UI/WebServerResources/scss/components/subheader/subheader.scss
index a70544895..2b4d761fd 100644
--- a/UI/WebServerResources/scss/components/subheader/subheader.scss
+++ b/UI/WebServerResources/scss/components/subheader/subheader.scss
@@ -11,6 +11,13 @@
     padding: 0 0 0 $layout-gutter-width;
   }
 }
+md-tab-content {
+  .md-subheader {
+    .md-subheader-inner {
+      padding-left: $layout-gutter-width/2;
+    }
+  }
+}
 
 .sg-md-subheader {
   &--fixed {