4 files changed, 5 insertions, 5 deletions
diff --git a/core/css/apps.css b/core/css/apps.css
index c07b3f67c7c..186184a8584 100644
--- a/core/css/apps.css
+++ b/core/css/apps.css
@@ -97,7 +97,7 @@ html {
 
 body {
   background-color: var(--color-background-plain, var(--color-main-background));
-  background-image: var(--image-background-plain, var(--image-background));
+  background-image: var(--image-background-plain, var(--image-background, var(--image-background-default)));
   background-size: cover;
   background-position: center;
   position: fixed;
diff --git a/core/css/apps.scss b/core/css/apps.scss
index b52a5a37793..bdc1fe95a06 100644
--- a/core/css/apps.scss
+++ b/core/css/apps.scss
@@ -47,7 +47,7 @@ html {
 
 body {
 	background-color: var(--color-background-plain, var(--color-main-background));
-	background-image: var(--image-background-plain, var(--image-background));
+	background-image: var(--image-background-plain, var(--image-background, var(--image-background-default)));
 	background-size: cover;
 	background-position: center;
 	position: fixed;
diff --git a/core/css/guest.css b/core/css/guest.css
index 7baa6017a55..0a26afdf116 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -23,8 +23,8 @@ body {
 	font-family: -apple-system, BlinkMacSystemFont, 'Segoe UI', Roboto, Oxygen-Sans, Ubuntu, Cantarell, 'Helvetica Neue', Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', 'Segoe UI Symbol';
 	color: var(--color-text);
 	text-align: center;
-	background-color: var(--color-primary-default, var(--color-primary));
-	background-image: var(--image-background-plain, var(--image-background, url('../../../core/img/app-background.jpg'), linear-gradient(40deg, #0082c9 0%, #30b6ff 100%)));
+	background-color: var(--color-main-background-not-plain, var(--color-primary));
+	background-image: var(--image-background, var(--image-background-plain, linear-gradient(40deg, #0082c9 0%, #30b6ff 100%)));
     background-attachment: fixed;
 	min-height: 100%; /* fix sticky footer */
 	height: auto;
diff --git a/core/css/server.css b/core/css/server.css
index 58fb6189106..c8333d0b98d 100644
--- a/core/css/server.css
+++ b/core/css/server.css
@@ -2679,7 +2679,7 @@ html {
 
 body {
   background-color: var(--color-background-plain, var(--color-main-background));
-  background-image: var(--image-background-plain, var(--image-background));
+  background-image: var(--image-background-plain, var(--image-background, var(--image-background-default)));
   background-size: cover;
   background-position: center;
   position: fixed;