diff --git a/src/app/components/favorites/favorites.component.html b/src/app/components/favorites/favorites.component.html
index 68b6d6a64..3a9f28062 100644
--- a/src/app/components/favorites/favorites.component.html
+++ b/src/app/components/favorites/favorites.component.html
@@ -7,6 +7,7 @@
 
             <button
                 mat-icon-button
+                color="primary"
                 *ngIf="canPreviewFile(documentList.selection)"
                 title="{{ 'APP.ACTIONS.VIEW' | translate }}"
                 (click)="onNodeDoubleClick(documentList.selection[0]?.entry)">
@@ -15,6 +16,7 @@
 
             <button
                 mat-icon-button
+                color="primary"
                 *ngIf="hasSelection(documentList.selection)"
                 title="{{ 'APP.ACTIONS.DOWNLOAD' | translate }}"
                 [adfNodeDownload]="documentList.selection">
@@ -23,6 +25,7 @@
 
             <button
                 mat-icon-button
+                color="primary"
                 *ngIf="showEditOption(documentList.selection)"
                 title="{{ 'APP.ACTIONS.EDIT' | translate }}"
                 [adf-edit-folder]="documentList.selection[0]?.entry">
@@ -30,7 +33,7 @@
             </button>
 
             <button mat-icon-button
-                [color]="infoDrawerOpened ? 'primary' : 'accent'"
+                [color]="infoDrawerOpened ? 'accent' : 'primary'"
                 *ngIf="documentList.selection.length"
                 title="{{ 'APP.ACTIONS.DETAILS' | translate }}"
                 (click)="toggleSidebar()">
@@ -38,6 +41,7 @@
             </button>
 
             <button
+                color="primary"
                 mat-icon-button
                 *ngIf="hasSelection(documentList.selection)"
                 title="{{ 'APP.ACTIONS.MORE' | translate }}"
@@ -52,7 +56,10 @@
                     #selection="adfFavorite"
                     (toggle)="refresh()"
                     [adf-node-favorite]="documentList.selection">
-                    <mat-icon [ngClass]="{ 'icon-highlight': selection.hasFavorites() }">
+                    <mat-icon [ngClass]="{
+                        'toolbar__option--active': selection.hasFavorites(),
+                        'toolbar__option--default': !selection.hasFavorites()
+                    }">
                         {{ selection.hasFavorites() ? 'star' :'star_border' }}
                     </mat-icon>
                     <span>{{ 'APP.ACTIONS.FAVORITE' | translate }}</span>
@@ -61,21 +68,21 @@
                 <button
                     mat-menu-item
                     [app-copy-node]="documentList.selection">
-                    <mat-icon>content_copy</mat-icon>
+                    <mat-icon color="primary">content_copy</mat-icon>
                     <span>{{ 'APP.ACTIONS.COPY' | translate }}</span>
                 </button>
 
                 <button
                     mat-menu-item
                     [app-move-node]="documentList.selection">
-                    <mat-icon>library_books</mat-icon>
+                    <mat-icon color="primary">library_books</mat-icon>
                     <span>{{ 'APP.ACTIONS.MOVE' | translate }}</span>
                 </button>
 
                 <button
                     mat-menu-item
                     [app-delete-node]="documentList.selection">
-                    <mat-icon>delete</mat-icon>
+                    <mat-icon color="primary">delete</mat-icon>
                     <span>{{ 'APP.ACTIONS.DELETE' | translate }}</span>
                 </button>
 
@@ -83,7 +90,7 @@
                     mat-menu-item
                     *ngIf="isFileSelected(documentList.selection)"
                     [app-node-versions]="documentList.selection">
-                    <mat-icon>storage</mat-icon>
+                    <mat-icon color="primary">storage</mat-icon>
                     <span>{{ 'APP.ACTIONS.VERSIONS' | translate }}</span>
                 </button>
             </mat-menu>
diff --git a/src/app/components/files/files.component.html b/src/app/components/files/files.component.html
index e6b2d90b1..2e960c20d 100644
--- a/src/app/components/files/files.component.html
+++ b/src/app/components/files/files.component.html
@@ -8,6 +8,7 @@
 
         <adf-toolbar class="inline">
             <button
+                color="primary"
                 mat-icon-button
                 *ngIf="canPreviewFile(documentList.selection)"
                 title="{{ 'APP.ACTIONS.VIEW' | translate }}"
@@ -16,6 +17,7 @@
             </button>
 
             <button
+                color="primary"
                 mat-icon-button
                 *ngIf="hasSelection(documentList.selection)"
                 title="{{ 'APP.ACTIONS.DOWNLOAD' | translate }}"
@@ -24,6 +26,7 @@
             </button>
 
             <button
+                color="primary"
                 mat-icon-button
                 *ngIf="canEditFolder(documentList.selection)"
                 title="{{ 'APP.ACTIONS.EDIT' | translate }}"
@@ -32,7 +35,7 @@
             </button>
 
             <button mat-icon-button
-                [color]="infoDrawerOpened ? 'primary' : 'accent'"
+                [color]="infoDrawerOpened ? 'accent' : 'primary'"
                 *ngIf="documentList.selection.length"
                 title="{{ 'APP.ACTIONS.DETAILS' | translate }}"
                 (click)="toggleSidebar()">
@@ -40,6 +43,7 @@
             </button>
 
             <button
+                color="primary"
                 mat-icon-button
                 *ngIf="hasSelection(documentList.selection)"
                 title="{{ 'APP.ACTIONS.MORE' | translate }}"
@@ -54,7 +58,10 @@
                     mat-menu-item
                     #selection="adfFavorite"
                     [adf-node-favorite]="documentList.selection">
-                    <mat-icon [ngClass]="{ 'icon-highlight': selection.hasFavorites() }">
+                    <mat-icon [ngClass]="{
+                        'toolbar__option--active': selection.hasFavorites(),
+                        'toolbar__option--default': !selection.hasFavorites()
+                    }">
                         {{ selection.hasFavorites() ? 'star' :'star_border' }}
                     </mat-icon>
                     <span>{{ 'APP.ACTIONS.FAVORITE' | translate }}</span>
@@ -63,7 +70,7 @@
                 <button
                     mat-menu-item
                     [app-copy-node]="documentList.selection">
-                    <mat-icon>content_copy</mat-icon>
+                    <mat-icon color="primary">content_copy</mat-icon>
                     <span>{{ 'APP.ACTIONS.COPY' | translate }}</span>
                 </button>
 
@@ -71,7 +78,7 @@
                     mat-menu-item
                     *ngIf="canMove(documentList.selection)"
                     [app-move-node]="documentList.selection">
-                    <mat-icon>library_books</mat-icon>
+                    <mat-icon color="primary">library_books</mat-icon>
                     <span>{{ 'APP.ACTIONS.MOVE' | translate }}</span>
                 </button>
 
@@ -79,7 +86,7 @@
                     mat-menu-item
                     *ngIf="canDelete(documentList.selection)"
                     [app-delete-node]="documentList.selection">
-                    <mat-icon>delete</mat-icon>
+                    <mat-icon color="primary">delete</mat-icon>
                     <span>{{ 'APP.ACTIONS.DELETE' | translate }}</span>
                 </button>
 
@@ -87,7 +94,7 @@
                     mat-menu-item
                     *ngIf="canManageVersions(documentList.selection)"
                     [app-node-versions]="documentList.selection">
-                    <mat-icon>storage</mat-icon>
+                    <mat-icon color="primary">storage</mat-icon>
                     <span>{{ 'APP.ACTIONS.VERSIONS' | translate }}</span>
                 </button>
             </mat-menu>
diff --git a/src/app/components/recent-files/recent-files.component.html b/src/app/components/recent-files/recent-files.component.html
index 4157fe3fb..4ce11ae36 100644
--- a/src/app/components/recent-files/recent-files.component.html
+++ b/src/app/components/recent-files/recent-files.component.html
@@ -7,6 +7,7 @@
 
             <button
                 mat-icon-button
+                color="primary"
                 *ngIf="canPreviewFile(documentList.selection)"
                 title="{{ 'APP.ACTIONS.VIEW' | translate }}"
                 (click)="onNodeDoubleClick(documentList.selection[0]?.entry)">
@@ -15,6 +16,7 @@
 
             <button
                 mat-icon-button
+                color="primary"
                 *ngIf="hasSelection(documentList.selection)"
                 title="{{ 'APP.ACTIONS.DOWNLOAD' | translate }}"
                 [adfNodeDownload]="documentList.selection">
@@ -22,7 +24,7 @@
             </button>
 
             <button mat-icon-button
-                [color]="infoDrawerOpened ? 'primary' : 'accent'"
+                [color]="infoDrawerOpened ? 'accent' : 'primary'"
                 *ngIf="documentList.selection.length"
                 title="{{ 'APP.ACTIONS.DETAILS' | translate }}"
                 (click)="toggleSidebar()">
@@ -30,12 +32,14 @@
             </button>
 
             <button
+                color="primary"
                 mat-icon-button
                 *ngIf="hasSelection(documentList.selection)"
                 title="{{ 'APP.ACTIONS.MORE' | translate }}"
                 [matMenuTriggerFor]="actionsMenu">
                 <mat-icon>more_vert</mat-icon>
             </button>
+
             <mat-menu #actionsMenu="matMenu"
                 [overlapTrigger]="false"
                 class="secondary-options">
@@ -43,7 +47,10 @@
                     mat-menu-item
                     #selection="adfFavorite"
                     [adf-node-favorite]="documentList.selection">
-                    <mat-icon [ngClass]="{ 'icon-highlight': selection.hasFavorites() }">
+                    <mat-icon [ngClass]="{
+                        'toolbar__option--active': selection.hasFavorites(),
+                        'toolbar__option--default': !selection.hasFavorites()
+                    }">
                         {{ selection.hasFavorites() ? 'star' :'star_border' }}
                     </mat-icon>
                     <span>{{ 'APP.ACTIONS.FAVORITE' | translate }}</span>
@@ -52,7 +59,7 @@
                 <button
                     mat-menu-item
                     [app-copy-node]="documentList.selection">
-                    <mat-icon>content_copy</mat-icon>
+                    <mat-icon color="primary">content_copy</mat-icon>
                     <span>{{ 'APP.ACTIONS.COPY' | translate }}</span>
                 </button>
 
@@ -60,7 +67,7 @@
                     mat-menu-item
                     *ngIf="canMove(documentList.selection)"
                     [app-move-node]="documentList.selection">
-                    <mat-icon>library_books</mat-icon>
+                    <mat-icon color="primary">library_books</mat-icon>
                     <span>{{ 'APP.ACTIONS.MOVE' | translate }}</span>
                 </button>
 
@@ -68,7 +75,7 @@
                     mat-menu-item
                     *ngIf="canDelete(documentList.selection)"
                     [app-delete-node]="documentList.selection">
-                    <mat-icon>delete</mat-icon>
+                    <mat-icon color="primary">delete</mat-icon>
                     <span>{{ 'APP.ACTIONS.DELETE' | translate }}</span>
                 </button>
 
@@ -76,7 +83,7 @@
                     mat-menu-item
                     *ngIf="canManageVersions(documentList.selection)"
                     [app-node-versions]="documentList.selection">
-                    <mat-icon>storage</mat-icon>
+                    <mat-icon color="primary">storage</mat-icon>
                     <span>{{ 'APP.ACTIONS.VERSIONS' | translate }}</span>
                 </button>
             </mat-menu>
diff --git a/src/app/components/shared-files/shared-files.component.html b/src/app/components/shared-files/shared-files.component.html
index c262aaa4c..9a28a5948 100644
--- a/src/app/components/shared-files/shared-files.component.html
+++ b/src/app/components/shared-files/shared-files.component.html
@@ -4,8 +4,8 @@
         </adf-breadcrumb>
 
         <adf-toolbar class="inline">
-
             <button
+                color="primary"
                 mat-icon-button
                 *ngIf="canPreviewFile(documentList.selection)"
                 title="{{ 'APP.ACTIONS.VIEW' | translate }}"
@@ -14,6 +14,7 @@
             </button>
 
             <button
+                color="primary"
                 mat-icon-button
                 *ngIf="hasSelection(documentList.selection)"
                 title="{{ 'APP.ACTIONS.DOWNLOAD' | translate }}"
@@ -22,7 +23,7 @@
             </button>
 
             <button mat-icon-button
-                [color]="infoDrawerOpened ? 'primary' : 'accent'"
+                [color]="infoDrawerOpened ? 'accent' : 'primary'"
                 *ngIf="documentList.selection.length"
                 title="{{ 'APP.ACTIONS.DETAILS' | translate }}"
                 (click)="toggleSidebar()">
@@ -30,12 +31,14 @@
             </button>
 
             <button
+                color="primary"
                 mat-icon-button
                 *ngIf="hasSelection(documentList.selection)"
                 title="{{ 'APP.ACTIONS.MORE' | translate }}"
                 [matMenuTriggerFor]="actionsMenu">
                 <mat-icon>more_vert</mat-icon>
             </button>
+
             <mat-menu #actionsMenu="matMenu"
                 [overlapTrigger]="false"
                 class="secondary-options">
@@ -43,7 +46,10 @@
                     mat-menu-item
                     #selection="adfFavorite"
                     [adf-node-favorite]="documentList.selection">
-                    <mat-icon [ngClass]="{ 'icon-highlight': selection.hasFavorites() }">
+                    <mat-icon [ngClass]="{
+                        'toolbar__option--active': selection.hasFavorites(),
+                        'toolbar__option--default': !selection.hasFavorites()
+                    }">
                         {{ selection.hasFavorites() ? 'star' :'star_border' }}
                     </mat-icon>
                     <span>{{ 'APP.ACTIONS.FAVORITE' | translate }}</span>
@@ -52,7 +58,7 @@
                 <button
                     mat-menu-item
                     [app-copy-node]="documentList.selection">
-                    <mat-icon>content_copy</mat-icon>
+                    <mat-icon color="primary">content_copy</mat-icon>
                     <span>{{ 'APP.ACTIONS.COPY' | translate }}</span>
                 </button>
 
@@ -60,7 +66,7 @@
                     mat-menu-item
                     *ngIf="canMoveShared(documentList.selection)"
                     [app-move-node]="documentList.selection">
-                    <mat-icon>library_books</mat-icon>
+                    <mat-icon color="primary">library_books</mat-icon>
                     <span>{{ 'APP.ACTIONS.MOVE' | translate }}</span>
                 </button>
 
@@ -69,7 +75,7 @@
                     *ngIf="canDelete(documentList.selection)"
                     [appUnshareNode]="documentList.selection"
                     (links-unshared)="refresh()">
-                    <mat-icon>stop_screen_share</mat-icon>
+                    <mat-icon color="primary">stop_screen_share</mat-icon>
                     <span>{{ 'APP.ACTIONS.UNSHARE' | translate }}</span>
                 </button>
 
@@ -77,7 +83,7 @@
                     mat-menu-item
                     *ngIf="canDeleteShared(documentList.selection)"
                     [app-delete-node]="documentList.selection">
-                    <mat-icon>delete</mat-icon>
+                    <mat-icon color="primary">delete</mat-icon>
                     <span>{{ 'APP.ACTIONS.DELETE' | translate }}</span>
                 </button>
 
@@ -85,7 +91,7 @@
                     mat-menu-item
                     *ngIf="canManageVersionsOfShared(documentList.selection)"
                     [app-node-versions]="documentList.selection">
-                    <mat-icon>storage</mat-icon>
+                    <mat-icon color="primary">storage</mat-icon>
                     <span>{{ 'APP.ACTIONS.VERSIONS' | translate }}</span>
                 </button>
             </mat-menu>
diff --git a/src/app/components/trashcan/trashcan.component.html b/src/app/components/trashcan/trashcan.component.html
index 9999a736d..7e7548eee 100644
--- a/src/app/components/trashcan/trashcan.component.html
+++ b/src/app/components/trashcan/trashcan.component.html
@@ -5,6 +5,7 @@
 
         <adf-toolbar class="inline">
             <button
+                color="primary"
                 mat-icon-button
                 [app-permanent-delete-node]="documentList.selection"
                 (selection-node-deleted)="refresh()"
@@ -14,6 +15,7 @@
             </button>
 
             <button
+                color="primary"
                 mat-icon-button
                 (selection-node-restored)="refresh()"
                 [app-restore-node]="documentList.selection"
diff --git a/src/app/ui/custom-theme.scss b/src/app/ui/custom-theme.scss
index e6fdd28c8..d84615b8f 100644
--- a/src/app/ui/custom-theme.scss
+++ b/src/app/ui/custom-theme.scss
@@ -2,6 +2,7 @@
 @import '~@alfresco/adf-content-services/theming';
 
 @import '../components/sidenav/sidenav.component.theme';
+@import './overrides/toolbar';
 
 $grey-scale: (
     50 : #e0e0e0,
@@ -45,4 +46,5 @@ $custom-theme: mat-light-theme($custom-theme-primary, $custom-theme-accent);
 
 @mixin custom-theme($theme) {
     @include sidenav-component-theme($custom-theme);
+    @include toolbar-component-theme($custom-theme);
 }
diff --git a/src/app/ui/overrides/_toolbar.scss b/src/app/ui/overrides/_toolbar.scss
index 1b3344379..a9bbe406b 100644
--- a/src/app/ui/overrides/_toolbar.scss
+++ b/src/app/ui/overrides/_toolbar.scss
@@ -1,39 +1,47 @@
-@import 'variables.scss';
+@import 'variables';
 
 .adf-toolbar {
     .mat-toolbar-single-row {
         padding: 0 14px;
+        height: 48px;
     }
 
-    // TODO: review and remove once ADF 2.0.0 is out
     &.inline {
         .mat-toolbar {
             border: none !important;
-            background: $alfresco-gray-background;
             padding: 0;
-            height: 48px;
         }
+    }
+}
 
-        // TODO remove once it gets to ADF
-        .mat-icon {
-            color: $alfresco-secondary-text-color;
-        }
+@mixin toolbar-component-theme($theme) {
+    $primary: map-get($theme, primary);
+    $accent: map-get($theme, accent);
+    $background: map-get($theme, background);
 
-        &-row {
-            & > button {
-                color: $alfresco-secondary-text-color;
+    .adf-toolbar {
+        @include angular-material-theme($theme);
+
+        &.inline {
+            .mat-toolbar {
+                background-color: mat-color($background, background);
             }
         }
     }
-}
 
-.secondary-options {
-    // TODO remove once it gets to ADF
-    button {
-        color: $alfresco-secondary-text-color;
-    }
+    .secondary-options {
+        @include angular-material-theme($theme);
 
-    .icon-highlight {
-        color: $alfresco-primary-accent--default;
+        .toolbar__option--active {
+            color: mat-color($accent) !important;
+        }
+
+        .toolbar__option--default {
+            color: mat-color($primary, .87) !important;
+        }
+
+        button span {
+            color: mat-color($primary, .87);
+        }
     }
 }