diff --git a/packages/app-shell/src/app-shell.js b/packages/app-shell/src/app-shell.js
index 2bbe339eeafaee29259d936b163a21fb48a98fa0..b35a59d13d2a2c6c340d499adcad519161a30cb1 100644
--- a/packages/app-shell/src/app-shell.js
+++ b/packages/app-shell/src/app-shell.js
@@ -643,7 +643,7 @@ export class AppShell extends ScopedElementsMixin(DBPLitElement) {
 
             aside .subtitle {
                 display: none;
-                color: #4a4a4a;
+                color: var(--dbp-text-dark);
                 font-size: 1.25rem;
                 font-weight: 300;
                 line-height: 1.25;
diff --git a/packages/file-handling/src/nextcloud-file-picker.js b/packages/file-handling/src/nextcloud-file-picker.js
index 91209016ff12622f12af0dcd8d59f2fed1d0d16f..e33add2676c90ae3b9a052a153e4cfb28ea3869f 100644
--- a/packages/file-handling/src/nextcloud-file-picker.js
+++ b/packages/file-handling/src/nextcloud-file-picker.js
@@ -159,6 +159,7 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
         this.updateComplete.then(() => {
             // see: https://developer.mozilla.org/en-US/docs/Web/API/Window/postMessage
             window.addEventListener('message', this._onReceiveWindowMessage);
+
             // see: http://tabulator.info/docs/4.7
             this.tabulatorTable = new Tabulator(this._("#directory-content-table"), {
                 layout: "fitColumns",
@@ -191,7 +192,10 @@ export class NextcloudFilePicker extends ScopedElementsMixin(DBPLitElement) {
                             const icon_tag = that.getScopedTagName("dbp-icon");
                             let disabled = this.directoriesOnly ? "nextcloud-picker-icon-disabled" : "";
                             let icon = `<${icon_tag} name="empty-file" class="nextcloud-picker-icon ` + disabled + `"></${icon_tag}>`;
-                            return (cell.getValue() === "directory") ? `<${icon_tag} name="folder" class="nextcloud-picker-icon"></${icon_tag}>` : icon;
+                            let html =  (cell.getValue() === "directory") ? `<${icon_tag} name="folder" class="nextcloud-picker-icon"></${icon_tag}>` : icon;
+                            let div = this.shadowRoot.createElement("div");
+                            div.innerHTML = html;
+                            return div;
                         }
                     },
                     {