diff --git a/Build/Resources/Public/Less/Scaffold/_topbar.less b/Build/Resources/Public/Less/Scaffold/_topbar.less
index 6ea016435eaa4fb1d263a26c07edcdfa369a81b9..4f8cfb31264256c20689c0b94022ecb50fdfc964 100644
--- a/Build/Resources/Public/Less/Scaffold/_topbar.less
+++ b/Build/Resources/Public/Less/Scaffold/_topbar.less
@@ -130,7 +130,6 @@
 .topbar-header-site {
 	overflow: hidden;
 	position: relative;
-	display: block;
 	max-width: 100%;
 	height: @topbar-height;
 	line-height: @topbar-height;
diff --git a/typo3/sysext/backend/Classes/Controller/BackendController.php b/typo3/sysext/backend/Classes/Controller/BackendController.php
index b1a3bfad7dfc7bd882ec7a71a50b274ffce12309..9844a7c9b3ca3819ca13fe83fae34743229ccd98 100644
--- a/typo3/sysext/backend/Classes/Controller/BackendController.php
+++ b/typo3/sysext/backend/Classes/Controller/BackendController.php
@@ -293,7 +293,6 @@ class BackendController
         $view->assign('logoUrl', PathUtility::getAbsoluteWebPath($logoPath));
         $view->assign('logoWidth', $logoWidth);
         $view->assign('logoHeight', $logoHeight);
-        $view->assign('logoLink', TYPO3_URL_GENERAL);
         $view->assign('applicationVersion', TYPO3_version);
         $view->assign('siteName', $GLOBALS['TYPO3_CONF_VARS']['SYS']['sitename']);
         $view->assign('moduleMenu', $this->generateModuleMenu());
diff --git a/typo3/sysext/backend/Resources/Private/Templates/Backend/Main.html b/typo3/sysext/backend/Resources/Private/Templates/Backend/Main.html
index d60fde8e7f321ada4888aa281b03f72ee6312d52..4e9132bdd84ca3841f241d987cbf613a16fe3b0f 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/Backend/Main.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/Backend/Main.html
@@ -10,15 +10,17 @@
 				<button class="topbar-button topbar-button-navigationcomponent t3js-topbar-button-navigationcomponent">
 					<core:icon identifier="apps-pagetree-category-collapse-all" alternativeMarkupIdentifier="inline" />
 				</button>
-				<a href="{logoLink}" class="topbar-header-site" target="_blank" title="{siteName} - {applicationVersion}">
-					<span class="topbar-header-site-logo">
-						<img src="{logoUrl}" width="{logoWidth}" height="{logoHeight}" title="TYPO3 Content Management System" alt="" />
-					</span>
-					<span class="topbar-header-site-title">
-						<span class="topbar-header-site-name">{siteName}</span>
-						<span class="topbar-header-site-version">{applicationVersion}</span>
-					</span>
-				</a>
+				<div class="topbar-header-site">
+					<a href="./" target="_top" title="{siteName} - {applicationVersion}">
+						<span class="topbar-header-site-logo">
+							<img src="{logoUrl}" width="{logoWidth}" height="{logoHeight}" title="TYPO3 Content Management System" alt="" />
+						</span>
+						<span class="topbar-header-site-title">
+							<span class="topbar-header-site-name">{siteName}</span>
+							<span class="topbar-header-site-version">{applicationVersion}</span>
+						</span>
+					</a>
+				</div>
 				<button class="topbar-button topbar-button-toolbar t3js-topbar-button-toolbar">
 					<core:icon identifier="actions-system-extension-configure" alternativeMarkupIdentifier="inline" />
 				</button>
diff --git a/typo3/sysext/backend/Resources/Public/Css/backend.css b/typo3/sysext/backend/Resources/Public/Css/backend.css
index a1da708d84541676ff90007904e3714a75dc36db..758a167b07bb9b4ee15fe81c008775e40f58ab39 100644
--- a/typo3/sysext/backend/Resources/Public/Css/backend.css
+++ b/typo3/sysext/backend/Resources/Public/Css/backend.css
@@ -7357,7 +7357,6 @@ body {
 .topbar-header-site {
   overflow: hidden;
   position: relative;
-  display: block;
   max-width: 100%;
   height: 45px;
   line-height: 45px;