diff --git a/.travis.yml b/.travis.yml
index 37f91dddb..89ff290a3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,6 @@ node_js:
 cache:
   directories:
     - node_modules
-    - dist
 
 before_install:
   - sudo /etc/init.d/postgresql stop
@@ -33,18 +32,16 @@ jobs:
       script:
         - npm run test:ci
         - bash <(curl -s https://codecov.io/bash) -X gcov
-    - name: 'Prepare dist cache'
-      script: npm run build.e2e
     - stage: e2e
       name: Test Suite appNavigation
-      script: SUITE="--suite authentication,listViews,navigation,application,pagination" npm run e2e:docker
+      script: npm run build.e2e && SUITE="--suite authentication,listViews,navigation,application,pagination" npm run e2e:docker
     - name: Test Suite search&actionsAvailable
-      script: SUITE="--suite search,actionsAvailable" npm run e2e:docker
+      script: npm run build.e2e && SUITE="--suite search,actionsAvailable" npm run e2e:docker
     - name: Test Suite addRemoveContent
-      script: SUITE="--suite addRemoveContent" npm run e2e:docker
+      script: npm run build.e2e && SUITE="--suite addRemoveContent" npm run e2e:docker
     - name: Test Suite manageContent
-      script: SUITE="--suite manageContent" npm run e2e:docker
+      script: npm run build.e2e && SUITE="--suite manageContent" npm run e2e:docker
     - name: Test Suite sharingContent&markFavorite
-      script: SUITE="--suite sharingContent" npm run e2e:docker
+      script: npm run build.e2e && SUITE="--suite sharingContent" npm run e2e:docker
     - name: Test Suite viewContent&metadata&extensions
-      script: SUITE="--suite viewer,infoDrawer,extensions" npm run e2e:docker
+      script: npm run build.e2e && SUITE="--suite viewer,infoDrawer,extensions" npm run e2e:docker
diff --git a/src/app.config.json b/src/app.config.json
index 07cbb0062..59c704c40 100644
--- a/src/app.config.json
+++ b/src/app.config.json
@@ -132,7 +132,20 @@
           "items": [
             {
               "aspect": "exif:exif",
-              "properties": "*"
+              "properties": [
+                "exif:pixelXDimension",
+                "exif:pixelYDimension",
+                "exif:dateTimeOriginal",
+                "exif:exposureTime",
+                "exif:fNumber",
+                "exif:flash",
+                "exif:focalLength",
+                "exif:isoSpeedRatings",
+                "exif:orientation",
+                "exif:manufacturer",
+                "exif:model",
+                "exif:software"
+              ]
             }
           ]
         }
diff --git a/src/app/components/toolbar/toggle-info-drawer/toggle-info-drawer.component.ts b/src/app/components/toolbar/toggle-info-drawer/toggle-info-drawer.component.ts
index 2c268e305..326d5224a 100644
--- a/src/app/components/toolbar/toggle-info-drawer/toggle-info-drawer.component.ts
+++ b/src/app/components/toolbar/toggle-info-drawer/toggle-info-drawer.component.ts
@@ -36,7 +36,7 @@ import {
   template: `
     <button
       mat-icon-button
-      [color]="(infoDrawerOpened$ | async) ? 'accent' : 'primary'"
+      [color]="(infoDrawerOpened$ | async) ? 'primary' : ''"
       [attr.title]="'APP.ACTIONS.DETAILS' | translate"
       (click)="onClick()"
     >
diff --git a/src/app/components/toolbar/toolbar-action/toolbar-action.component.ts b/src/app/components/toolbar/toolbar-action/toolbar-action.component.ts
index e86c814f3..2552b1752 100644
--- a/src/app/components/toolbar/toolbar-action/toolbar-action.component.ts
+++ b/src/app/components/toolbar/toolbar-action/toolbar-action.component.ts
@@ -45,7 +45,7 @@ export class ToolbarActionComponent implements DoCheck {
   type = 'icon-button';
 
   @Input()
-  color = 'primary';
+  color = '';
 
   @Input()
   actionRef: ContentActionRef;
diff --git a/src/app/components/toolbar/toolbar-button/toolbar-button.component.ts b/src/app/components/toolbar/toolbar-button/toolbar-button.component.ts
index cd376597e..4c113db96 100644
--- a/src/app/components/toolbar/toolbar-button/toolbar-button.component.ts
+++ b/src/app/components/toolbar/toolbar-button/toolbar-button.component.ts
@@ -43,7 +43,7 @@ export class ToolbarButtonComponent {
   type: ToolbarButtonType = ToolbarButtonType.ICON_BUTTON;
 
   @Input()
-  color = 'primary';
+  color = '';
 
   @Input()
   actionRef: ContentActionRef;
diff --git a/src/app/components/toolbar/toolbar-menu/toolbar-menu.component.ts b/src/app/components/toolbar/toolbar-menu/toolbar-menu.component.ts
index 835cdd206..b74e4785c 100644
--- a/src/app/components/toolbar/toolbar-menu/toolbar-menu.component.ts
+++ b/src/app/components/toolbar/toolbar-menu/toolbar-menu.component.ts
@@ -37,7 +37,7 @@ export class ToolbarMenuComponent {
   actionRef: ContentActionRef;
 
   @Input()
-  color = 'primary';
+  color = '';
 
   get hasChildren(): boolean {
     return (
diff --git a/src/app/ui/custom-theme.scss b/src/app/ui/custom-theme.scss
index 30bf50817..4dba63a3d 100644
--- a/src/app/ui/custom-theme.scss
+++ b/src/app/ui/custom-theme.scss
@@ -11,7 +11,6 @@
 @import '../components/create-menu/create-menu.component.scss';
 @import '../components/layout/layout.theme.scss';
 
-@import './overrides/adf-toolbar.theme';
 @import 'overrides/adf-layout-container.theme';
 @import './overrides/adf-document-list.theme';
 
@@ -60,7 +59,6 @@ $foreground: map-get($custom-theme, foreground);
 $warn: map-get($custom-theme, warn);
 
 @mixin custom-theme($theme) {
-  @include custom-adf-toolbar-theme($theme);
   @include adf-document-list-theme($theme);
 
   @include layout-theme($theme);
@@ -73,6 +71,10 @@ $warn: map-get($custom-theme, warn);
   @include aca-current-user-theme($theme);
   @include aca-context-menu-theme($theme);
   @include app-create-menu-theme($theme);
+
+  .mat-toolbar {
+    color: var(--theme-text-color, rgba(0, 0, 0, 0.54));
+  }
 }
 
 //Custom variables - ACA specific styling:
diff --git a/src/app/ui/overrides/adf-toolbar.theme.scss b/src/app/ui/overrides/adf-toolbar.theme.scss
deleted file mode 100644
index b975fc27e..000000000
--- a/src/app/ui/overrides/adf-toolbar.theme.scss
+++ /dev/null
@@ -1,5 +0,0 @@
-@mixin custom-adf-toolbar-theme($theme) {
-  .adf-toolbar {
-    @include mat-button-theme($theme);
-  }
-}
diff --git a/src/assets/app.extensions.json b/src/assets/app.extensions.json
index 719f095c1..431d1127a 100644
--- a/src/assets/app.extensions.json
+++ b/src/assets/app.extensions.json
@@ -1050,7 +1050,20 @@
               {
                 "id": "app.content.metadata.exifAspect",
                 "aspect": "exif:exif",
-                "properties": "*"
+                "properties": [
+                  "exif:pixelXDimension",
+                  "exif:pixelYDimension",
+                  "exif:dateTimeOriginal",
+                  "exif:exposureTime",
+                  "exif:fNumber",
+                  "exif:flash",
+                  "exif:focalLength",
+                  "exif:isoSpeedRatings",
+                  "exif:orientation",
+                  "exif:manufacturer",
+                  "exif:model",
+                  "exif:software"
+                ]
               }
             ]
           }