diff --git a/core/css/guest.css b/core/css/guest.css
index 7baa6017a5559..a65b0dae27b2e 100644
--- a/core/css/guest.css
+++ b/core/css/guest.css
@@ -76,12 +76,9 @@ body {
 }
 
 #header .logo {
-	background-image: var(--image-logo, url('../../core/img/logo/logo.svg'));
-	background-repeat: no-repeat;
-	background-size: contain;
-	background-position: center;
-	width: 175px;
-	height: 130px;
+	max-width: 175px;
+	width: auto;
+	max-height: 130px;
 	margin: 0 auto;
 	position: relative;
 	left: unset;
diff --git a/core/css/header.css b/core/css/header.css
index eb48529c60810..8824a48f86385 100644
--- a/core/css/header.css
+++ b/core/css/header.css
@@ -173,15 +173,9 @@
 }
 #header .logo {
   display: inline-flex;
-  background-image: var(--image-logoheader, var(--image-logo, url("../img/logo/logo.svg")));
-  background-repeat: no-repeat;
-  background-size: contain;
-  background-position: center;
   width: 62px;
   position: absolute;
   left: 12px;
-  top: 1px;
-  bottom: 1px;
   filter: var(--image-logoheader-custom, var(--background-image-invert-if-bright));
 }
 #header .header-appname-container {
diff --git a/core/css/header.scss b/core/css/header.scss
index c363312ab8bdb..8691d464bd027 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -163,15 +163,9 @@
 	}
 	.logo {
 		display: inline-flex;
-		background-image: var(--image-logoheader, var(--image-logo, url('../img/logo/logo.svg')));
-		background-repeat: no-repeat;
-		background-size: contain;
-		background-position: center;
 		width: 62px;
 		position: absolute;
 		left: 12px;
-		top: 1px;
-		bottom: 1px;
 		// Invert if not customized and background is bright
 		filter: var(--image-logoheader-custom, var(--background-image-invert-if-bright));
 	}
diff --git a/core/css/server.css b/core/css/server.css
index cf837d3baa370..6639386c9c64d 100644
--- a/core/css/server.css
+++ b/core/css/server.css
@@ -2193,15 +2193,9 @@ label.infield {
 }
 #header .logo {
   display: inline-flex;
-  background-image: var(--image-logoheader, var(--image-logo, url("../img/logo/logo.svg")));
-  background-repeat: no-repeat;
-  background-size: contain;
-  background-position: center;
   width: 62px;
   position: absolute;
   left: 12px;
-  top: 1px;
-  bottom: 1px;
   filter: var(--image-logoheader-custom, var(--background-image-invert-if-bright));
 }
 #header .header-appname-container {
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index a302d19c99b0f..e4026639e1e66 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -35,7 +35,8 @@
 				<?php if ($_['bodyid'] === 'body-login'): ?>
 					<header role="banner">
 						<div id="header">
-							<div class="logo"></div>
+
+							<img class="logo" alt="<?php p($l->t('%s logo', [$theme->getName()])); ?>" src="<?= ($_['logoUrl'] ?? '') !== '' ? $_['logoUrl'] : $theme->getLogo(); ?>">
 						</div>
 					</header>
 				<?php endif; ?>
diff --git a/core/templates/layout.public.php b/core/templates/layout.public.php
index 8dfa4ecec72e3..e8b9e2a15e058 100644
--- a/core/templates/layout.public.php
+++ b/core/templates/layout.public.php
@@ -37,15 +37,8 @@
 	</div>
 
 	<header id="header">
-		<div class="header-left">
-			<div class="logo logo-icon svg"></div>
-			<span id="nextcloud" class="header-appname">
-				<?php if (isset($template) && $template->getHeaderTitle() !== '') { ?>
-					<?php p($template->getHeaderTitle()); ?>
-				<?php } else { ?>
-					<?php	p($theme->getName()); ?>
-				<?php } ?>
-			</span>
+		<div class="header-left" id="nextcloud">
+			<img class="logo logo-icon svg" alt="<?php p($l->t('%s logo', [$theme->getName()])); ?>" src="<?= ($_['logoUrl'] ?? '') !== '' ? $_['logoUrl'] : $theme->getLogo(); ?>">
 			<?php if (isset($template) && $template->getHeaderDetails() !== '') { ?>
 				<div class="header-shared-by">
 					<?php p($template->getHeaderDetails()); ?>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index bd4c816e23cb2..8cd87490c5581 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -60,7 +60,7 @@
 			<div class="header-left">
 				<a href="<?php print_unescaped($_['logoUrl'] ?: link_to('', 'index.php')); ?>"
 					id="nextcloud">
-					<div class="logo logo-icon"></div>
+					<img class="logo logo-icon" alt="<?php p($l->t('%s logo', [$theme->getName()])); ?>" src="<?= ($_['logoUrl'] ?? '') !== '' ? $_['logoUrl'] : $theme->getLogo(); ?>">
 				</a>
 
 				<nav id="header-left__appmenu"></nav>
diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
index e043f79745ac0..3e2e004cb9775 100644
--- a/lib/private/TemplateLayout.php
+++ b/lib/private/TemplateLayout.php
@@ -114,10 +114,6 @@ public function __construct($renderAs, $appId = '') {
 				$this->assign('enabledThemes', $themesService->getEnabledThemes());
 			}
 
-			// set logo link target
-			$logoUrl = $this->config->getSystemValueString('logo_url', '');
-			$this->assign('logoUrl', $logoUrl);
-
 			// Add navigation entry
 			$this->assign('application', '');
 			$this->assign('appid', $appId);
@@ -188,6 +184,11 @@ public function __construct($renderAs, $appId = '') {
 		} else {
 			parent::__construct('core', 'layout.base');
 		}
+
+		// set logo link target
+		$logoUrl = $this->config->getSystemValueString('logo_url', '');
+		$this->assign('logoUrl', $logoUrl);
+
 		// Send the language and the locale to our layouts
 		$lang = \OC::$server->getL10NFactory()->findLanguage();
 		$locale = \OC::$server->getL10NFactory()->findLocale($lang);