diff --git a/core/css/server.css b/core/css/server.css
index fc32683f937729a3c211702ebd7d5b756348b304..87ee92881d6c1b216552685affdf67ddb93bc9e6 100644
--- a/core/css/server.css
+++ b/core/css/server.css
@@ -254,13 +254,13 @@ body.theme--dark #settings #expanddiv {
     background-color: var(--input-background-color) !important;
 }
 /* use logos from theme */
-#header .logo,
+#header #nextcloud .logo,
 #firstrunwizard .logo {
     background-image: var(--logo);
     width: 256px;
     height: 128px;
 }
-#header .logo-icon {
+#header #nextcloud .logo-icon {
     width: 130px;
     height: 40px;
     top: 5px;
@@ -362,6 +362,7 @@ li.app-navigation-entry.app-navigation-entry--collapsible > a:hover,
 
 #header .app-menu .app-menu-entry img {
     filter: var(--inactive-icon-filter);
+    mask: unset;
 }
 
 #header .app-menu .app-menu-entry.app-menu-entry--active img {
@@ -390,7 +391,7 @@ body .icon-filetype-text {
 body .icon-filetype-folder-drag-accept {
     background-image: var(--icon-folder-drag-accept-007fff) !important;
 }
-#header .logo {
+#header #nextcloud .logo {
     background-image: var(--logo);
 }
 #body-user #header,
@@ -415,7 +416,7 @@ body .icon-filetype-folder-drag-accept {
     color: var(--color-main-text);
 }
 
-#header .logo {
+#header #nextcloud .logo {
     background-size: auto;
 }