diff --git a/src/OnboardingSPA/components/ImageUploader/components/ImageUploaderWithText/index.js b/src/OnboardingSPA/components/ImageUploader/components/ImageUploaderWithText/index.js
index 0ddfe016e..35b91c12c 100644
--- a/src/OnboardingSPA/components/ImageUploader/components/ImageUploaderWithText/index.js
+++ b/src/OnboardingSPA/components/ImageUploader/components/ImageUploaderWithText/index.js
@@ -168,9 +168,9 @@ const ImageUploaderWithText = ( { image, imageSetter } ) => {
 			'nfd-onboarding-image-uploader--with-text--not-dashed':
 				isImageUploaded,
 			'nfd-onboarding-image-uploader--with-text--not-dashed__dark':
-				pngLogoBgTheme === THEME_DARK,
+				isImageUploaded && pngLogoBgTheme === THEME_DARK,
 			'nfd-onboarding-image-uploader--with-text--not-dashed__light':
-				pngLogoBgTheme === THEME_LIGHT,
+				isImageUploaded && pngLogoBgTheme === THEME_LIGHT,
 		}
 	);
 
diff --git a/src/OnboardingSPA/components/ImageUploader/components/ImageUploaderWithText/stylesheet.scss b/src/OnboardingSPA/components/ImageUploader/components/ImageUploaderWithText/stylesheet.scss
index e15924413..a405f7596 100644
--- a/src/OnboardingSPA/components/ImageUploader/components/ImageUploaderWithText/stylesheet.scss
+++ b/src/OnboardingSPA/components/ImageUploader/components/ImageUploaderWithText/stylesheet.scss
@@ -14,26 +14,28 @@
 			border: 1.25px solid rgba(var(--nfd-onboarding-primary-rgb), 0.5);
 			align-items: stretch;
 
-			&__dark{
-				background-color: rgba(0,0,0,0.7);
+			&__dark {
+				background-color: rgba(0, 0, 0, 0.7);
 
-				.nfd-onboarding-image-uploader--with-text__site_logo__preview__details{
-					color: white;
+				.nfd-onboarding-image-uploader--with-text__site_logo__preview__details {
+					color: #fff;
 				}
-				.nfd-onboarding-image-uploader--with-text__site_logo__preview__reset__button__icon{
-					fill: white;
+
+				.nfd-onboarding-image-uploader--with-text__site_logo__preview__reset__button__icon {
+					fill: #fff;
 				}
 			}
 
-			&__light{
-				background-color: rgba(255,255,255,0.7);
-				
-				.nfd-onboarding-image-uploader--with-text__site_logo__preview__details{
-					color: black;
-				}	
-				.nfd-onboarding-image-uploader--with-text__site_logo__preview__reset__button__icon{
-					fill:black;
-				}			
+			&__light {
+				background-color: rgba(255, 255, 255, 0.7);
+
+				.nfd-onboarding-image-uploader--with-text__site_logo__preview__details {
+					color: #000;
+				}
+
+				.nfd-onboarding-image-uploader--with-text__site_logo__preview__reset__button__icon {
+					fill: #000;
+				}
 			}
 		}
 		border-radius: 8px;