diff --git a/Build/Resources/Public/Less/Scaffold/_toolbar.less b/Build/Resources/Public/Less/Scaffold/_toolbar.less
index b9bd6cfc63d8de611ce2d0b99903430fc6ff9bc4..66e510ef574250cd6c205b0c1ba8ebb09ae03b9d 100644
--- a/Build/Resources/Public/Less/Scaffold/_toolbar.less
+++ b/Build/Resources/Public/Less/Scaffold/_toolbar.less
@@ -51,6 +51,13 @@
 		display: table;
 		content: '';
 	}
+
+	li:last-child {
+		@media (min-width: @scaffold-breakpoint) {
+			width: 300px;
+		}
+
+	}
 }
 
 // Toolbar Item
@@ -162,9 +169,6 @@
 
 // Search
 .toolbar-item-search {
-	@media (min-width: @scaffold-breakpoint) {
-		width: 300px;
-	}
 	form {
 		padding: 0;
 		margin: 0;
diff --git a/typo3/sysext/backend/Classes/Backend/ToolbarItems/LiveSearchToolbarItem.php b/typo3/sysext/backend/Classes/Backend/ToolbarItems/LiveSearchToolbarItem.php
index f33244f27d9bf7ccaf6764e79344118dc0ac1754..0236af8787967673cfc86d5251b61f195349b0b1 100644
--- a/typo3/sysext/backend/Classes/Backend/ToolbarItems/LiveSearchToolbarItem.php
+++ b/typo3/sysext/backend/Classes/Backend/ToolbarItems/LiveSearchToolbarItem.php
@@ -55,7 +55,7 @@ class LiveSearchToolbarItem implements ToolbarItemInterface
 
         // Live search is heavily dependent on the list module and only available when that module is.
         $listModule = $backendModuleRepository->findByModuleName('web_list');
-        return $listModule !== null;
+        return $listModule !== null && $listModule !== false;
     }
 
     /**
diff --git a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItemDropDown.html b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItemDropDown.html
index ccdf8ffc57d543246c71701f0a01cdb49d3112a0..c34ad0768b237eeee7633ed57647d38ef6f83aa9 100644
--- a/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItemDropDown.html
+++ b/typo3/sysext/backend/Resources/Private/Templates/ToolbarItems/UserToolbarItemDropDown.html
@@ -23,7 +23,7 @@
     </div>
     <hr>
 </f:if>
-<f:link.typolink parameter="{logoutUrl}" class="btn btn-danger pull-right" target="_top">
+<f:link.typolink parameter="{logoutUrl}" class="btn btn-danger pull-left" target="_top">
     {icon -> f:format.raw()}
     <f:if condition="{switchUserMode}">
         <f:then>
diff --git a/typo3/sysext/backend/Resources/Public/Css/backend.css b/typo3/sysext/backend/Resources/Public/Css/backend.css
index 25abc92a5159549b437344c1ac28e99ff89de26e..d74644b2aa1fcd4c2eae00cd3cb2646bea390949 100644
--- a/typo3/sysext/backend/Resources/Public/Css/backend.css
+++ b/typo3/sysext/backend/Resources/Public/Css/backend.css
@@ -7573,6 +7573,11 @@ body {
   display: table;
   content: '';
 }
+@media (min-width: 992px) {
+  .toolbar-list li:last-child {
+    width: 300px;
+  }
+}
 .toolbar-item {
   padding: 4px;
   position: relative;
@@ -7671,11 +7676,6 @@ body {
     display: none;
   }
 }
-@media (min-width: 992px) {
-  .toolbar-item-search {
-    width: 300px;
-  }
-}
 .toolbar-item-search form {
   padding: 0;
   margin: 0;
diff --git a/typo3/sysext/install/Resources/Public/Css/install.css b/typo3/sysext/install/Resources/Public/Css/install.css
index 8df8dabc110bfc28669dad6816141a1b578764b9..403093de8b2382761ee79cf94db7f295903ee667 100644
--- a/typo3/sysext/install/Resources/Public/Css/install.css
+++ b/typo3/sysext/install/Resources/Public/Css/install.css
@@ -7563,6 +7563,11 @@ body {
   display: table;
   content: '';
 }
+@media (min-width: 992px) {
+  .toolbar-list li:last-child {
+    width: 300px;
+  }
+}
 .toolbar-item {
   padding: 4px;
   position: relative;
@@ -7661,11 +7666,6 @@ body {
     display: none;
   }
 }
-@media (min-width: 992px) {
-  .toolbar-item-search {
-    width: 300px;
-  }
-}
 .toolbar-item-search form {
   padding: 0;
   margin: 0;