diff --git a/src/app/components/search/search.component.scss b/src/app/components/search/search.component.scss
index 1cd6b8c50..671eb200c 100644
--- a/src/app/components/search/search.component.scss
+++ b/src/app/components/search/search.component.scss
@@ -25,6 +25,8 @@
 
     &--info-text {
         flex: 1;
+        font-size: 16px;
+        color: rgba(0, 0, 0, 0.54);
     }
 
     .adf-search-filter {
diff --git a/src/app/ui/application.scss b/src/app/ui/application.scss
index b537b4aca..4fe5b50a7 100644
--- a/src/app/ui/application.scss
+++ b/src/app/ui/application.scss
@@ -31,6 +31,5 @@ ng-component {
 @import './overrides/alfresco-upload-button';
 @import './overrides/alfresco-upload-dialog';
 @import './overrides/toolbar';
-@import './overrides/adf-info-drawer';
 @import './overrides/_adf-sidebar-action-menu';
 
diff --git a/src/app/ui/custom-theme.scss b/src/app/ui/custom-theme.scss
index 1ed6bf486..c1ce61c98 100644
--- a/src/app/ui/custom-theme.scss
+++ b/src/app/ui/custom-theme.scss
@@ -3,6 +3,8 @@
 
 @import '../components/sidenav/sidenav.component.theme';
 @import './overrides/toolbar';
+@import './overrides/adf-search-filter.theme';
+@import './overrides/adf-info-drawer.theme';
 @import 'snackbar';
 
 $grey-scale: (
@@ -49,4 +51,6 @@ $custom-theme: mat-light-theme($custom-theme-primary, $custom-theme-accent);
     @include sidenav-component-theme($custom-theme);
     @include toolbar-component-theme($custom-theme);
     @include snackbar-theme($custom-theme);
+    @include adf-search-filter-theme($custom-theme);
+    @include adf-info-drawer-theme($custom-theme);
 }
diff --git a/src/app/ui/overrides/_adf-info-drawer.scss b/src/app/ui/overrides/_adf-info-drawer.scss
deleted file mode 100644
index dbec2ec4f..000000000
--- a/src/app/ui/overrides/_adf-info-drawer.scss
+++ /dev/null
@@ -1,50 +0,0 @@
-$icon-size: 48px;
-
-.adf-info-drawer-layout {
-    height: 100%;
-
-    .adf-info-drawer-layout-content .adf-info-drawer-tabs .mat-tab-body-content {
-        .adf-manage-versions-empty,
-        .adf-manage-versions-no-permission {
-            margin: 24px;
-            color: rgba(0, 0, 0, 0.54);
-            text-align: justify;
-            display: flex;
-            flex-direction: column;
-
-            &-icon {
-                width: $icon-size;
-                height: $icon-size;
-                font-size: $icon-size;
-                margin: auto;
-            }
-        }
-    }
-}
-
-.adf-version-list-container,
-.adf-version-manager-dialog .adf-version-list-container {
-    .adf-version-list {
-        height: auto;
-    }
-
-    .mat-list .mat-list-item {
-        &.mat-3-line {
-            display: flex;
-            align-items: center;
-            height: 100%;
-            min-height: 88px;
-        }
-
-        .mat-list-item-content {
-            padding-top: 10px;
-            padding-bottom: 10px;
-            width: 100%;
-        }
-
-        .mat-line.adf-version-list-item-comment {
-            overflow: visible;
-            white-space: pre-wrap;
-        }
-    }
-}
diff --git a/src/app/ui/overrides/adf-info-drawer.theme.scss b/src/app/ui/overrides/adf-info-drawer.theme.scss
new file mode 100644
index 000000000..7cdfbeb92
--- /dev/null
+++ b/src/app/ui/overrides/adf-info-drawer.theme.scss
@@ -0,0 +1,60 @@
+@mixin adf-info-drawer-theme($theme) {
+    $foreground: map-get($theme, foreground);
+    $accent: map-get($theme, accent);
+    $icon-size: 48px;
+
+    .adf-info-drawer {
+        .adf-info-drawer-layout {
+            height: 100%;
+
+            .mat-tab-label {
+                color: mat-color($accent);
+            }
+
+            .adf-info-drawer-layout-content .adf-info-drawer-tabs .mat-tab-body-content {
+                .adf-manage-versions-empty,
+                .adf-manage-versions-no-permission {
+                    margin: 24px;
+                    color: mat-color($foreground, text, 0.54);
+                    text-align: justify;
+                    display: flex;
+                    flex-direction: column;
+
+                    &-icon {
+                        width: $icon-size;
+                        height: $icon-size;
+                        font-size: $icon-size;
+                        margin: auto;
+                    }
+                }
+            }
+        }
+
+        .adf-version-list-container,
+        .adf-version-manager-dialog .adf-version-list-container {
+            .adf-version-list {
+                height: auto;
+            }
+
+            .mat-list .mat-list-item {
+                &.mat-3-line {
+                    display: flex;
+                    align-items: center;
+                    height: 100%;
+                    min-height: 88px;
+                }
+
+                .mat-list-item-content {
+                    padding-top: 10px;
+                    padding-bottom: 10px;
+                    width: 100%;
+                }
+
+                .mat-line.adf-version-list-item-comment {
+                    overflow: visible;
+                    white-space: pre-wrap;
+                }
+            }
+        }
+    }
+}
diff --git a/src/app/ui/overrides/adf-search-filter.theme.scss b/src/app/ui/overrides/adf-search-filter.theme.scss
new file mode 100644
index 000000000..2c3320180
--- /dev/null
+++ b/src/app/ui/overrides/adf-search-filter.theme.scss
@@ -0,0 +1,16 @@
+@mixin adf-search-filter-theme($theme) {
+    $foreground: map-get($theme, foreground);
+
+    .adf-search-filter {
+        .mat-expansion-panel-header-title {
+            font-size: 14px;
+            color: mat-color($foreground, text, 0.87);
+        }
+
+        .mat-checkbox-label,
+        .mat-radio-label {
+            color: mat-color($foreground, text, 0.54);
+        }
+    }
+
+}