diff --git a/demo-shell-ng2/app/components/activiti/activiti-demo.component.css b/demo-shell-ng2/app/components/activiti/activiti-demo.component.css
index d15a1a7e6e..a8a9a75f8f 100644
--- a/demo-shell-ng2/app/components/activiti/activiti-demo.component.css
+++ b/demo-shell-ng2/app/components/activiti/activiti-demo.component.css
@@ -69,16 +69,6 @@
     min-width: 680px;
 }
 
-.activiti-demo-tasks-menu >>> .mat-list .mat-list-item .mat-list-item-content {
-    height: 32px;
-    cursor: pointer;
-    padding: 0 16px 0 24px;
-}
-
-.activiti-demo-tasks-menu >>> .adf-panel-heading {
-    margin-bottom: 10px;
-}
-
 .activiti-demo-tasks-list >>> .adf-data-table {
     border: none;
 }
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.html b/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.html
index 17ad2ac879..82fb04e74b 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.html
+++ b/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.html
@@ -1,12 +1,9 @@
 <div class="menu-container">
     <md-list>
         <md-list-item (click)="selectFilter(filter)" *ngFor="let filter of filters"
-                      [class.active]="currentFilter === filter">
-                        <span class="mdl-list__item-primary-content">
-            <i *ngIf="hasIcon" class="material-icons mdl-list__item-icon adf-filters__entry-icon"
-               [attr.data-automation-id]="filter.name + '_filter'">assignment</i>
-            {{filter.name}}
-            </span>
+                      class="adf-filters__entry" [class.active]="currentFilter === filter">
+            <md-icon *ngIf="hasIcon" mdListIcon class="adf-filters__entry-icon">assignment</md-icon>
+            <span mdLine [attr.data-automation-id]="filter.name + '_filter'">{{filter.name}}</span>
         </md-list-item>
     </md-list>
 </div>
diff --git a/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.scss b/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.scss
index 39f63cba97..942bc154a8 100644
--- a/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.scss
+++ b/ng2-components/ng2-activiti-tasklist/src/components/task-filters.component.scss
@@ -1,29 +1,29 @@
 @mixin mat-filters-task-theme($theme) {
     $primary: map-get($theme, primary);
 
-    .mdl-list__item {
-        cursor: pointer;
-    }
-
     .adf {
 
         &-filters__entry {
             cursor: pointer;
+            font-size: 14px!important;
+            font-weight: bold;
+            opacity: .54;
+            padding-left: 30px;
+
+            .mat-list-item-content {
+                height: 34px;
+            }
         }
 
         &-filters__entry-icon {
-            margin-right: 12px !important;
+            padding-right: 12px !important;
+            padding-left: 0px !important;
         }
 
         &-filters__entry {
-            &.active {
-                color: mat-color($primary);
-            }
-            &:hover {
-                opacity: 0.8;
-            }
-            &.active .adf-filters__entry-icon {
+            &.active, &:hover {
                 color: mat-color($primary);
+                opacity: 1;
             }
         }