diff --git a/apps/dashboard/css/dashboard.scss b/apps/dashboard/css/dashboard.scss
index a320b3e3c99629b762435c5aac966b50ddc5c0fb..9edf00a24206541d4aa2c1f363854bc23a996de8 100644
--- a/apps/dashboard/css/dashboard.scss
+++ b/apps/dashboard/css/dashboard.scss
@@ -40,7 +40,7 @@ body.dashboard-inverted:not(.dashboard-dark) {
 		filter: invert(0);
 	}
 	#appmenu .icon-more-white,
-	.header-right > div:not(#settings) > * {
+	.header-right > div:not(#settings) > *:first-child {
 		filter: invert(1) hue-rotate(180deg);
 	}
 }
@@ -62,10 +62,10 @@ body.dashboard-dark:not(.dashboard-inverted) {
 		color: #000;
 	}
 	#appmenu svg {
-		filter: invert(1) !important;
+		filter: invert(1) hue-rotate(180deg) !important;
 	}
 	#appmenu .icon-more-white,
-	.header-right > div:not(#settings) > * {
-		filter: invert(1) hue-rotate(180deg);
+	.header-right > div:not(#settings) > *:first-child {
+		filter: invert(1) hue-rotate(180deg) !important;
 	}
 }
diff --git a/apps/dashboard/src/App.vue b/apps/dashboard/src/App.vue
index a2cccfce3ff6dca7ce32493b7f8052b012df60c8..8a5daf904c48d8ebcf96b36887cd46a6e6f554bb 100644
--- a/apps/dashboard/src/App.vue
+++ b/apps/dashboard/src/App.vue
@@ -275,6 +275,7 @@ export default {
 			this.updateGlobalStyles()
 		},
 		updateGlobalStyles() {
+			document.body.setAttribute('data-dashboard-background', this.background)
 			if (window.OCA.Theming.inverted) {
 				document.body.classList.add('dashboard-inverted')
 			}