diff --git a/Build/Resources/Public/Less/Component/module.less b/Build/Resources/Public/Less/Component/module.less
index 95b48bb1ff962cb1fd15006f11532831cc80ab61..1bc7e04f8b3dbcc0497c511383ebacda15f01c6b 100644
--- a/Build/Resources/Public/Less/Component/module.less
+++ b/Build/Resources/Public/Less/Component/module.less
@@ -76,7 +76,14 @@
 			margin-bottom: 0;
 		}
 		.form-group {
+			vertical-align: top;
 			margin: 0;
+			@media (min-width: @screen-sm-min) {
+				display: inline-block;
+			}
+			.form-control {
+				vertical-align: top;
+			}
 		}
 		.form-inline-spaced {
 			margin: 0;
diff --git a/Build/Resources/Public/Less/TYPO3/_element_buttons.less b/Build/Resources/Public/Less/TYPO3/_element_buttons.less
index 936e7e329371e94a77249834ea0a684825de851d..ae9cab9c53636ba54d7f88c39bc06f2130762ec8 100644
--- a/Build/Resources/Public/Less/TYPO3/_element_buttons.less
+++ b/Build/Resources/Public/Less/TYPO3/_element_buttons.less
@@ -2,7 +2,7 @@
 // Button
 //
 .btn-sm {
-	min-height: floor(2px + (@padding-small-vertical * 2) + (@font-size-small * @line-height-small));
+	height: floor(2px + (@padding-small-vertical * 2) + (@font-size-small * @line-height-small));
 }
 
 //
diff --git a/Build/Resources/Public/Less/TYPO3/_element_pagetree.less b/Build/Resources/Public/Less/TYPO3/_element_pagetree.less
index e3ef9efd0d60aa400be627d5323008564da880c0..c89651cff3b7d35f9d383cd3ab23f166116a0ec8 100644
--- a/Build/Resources/Public/Less/TYPO3/_element_pagetree.less
+++ b/Build/Resources/Public/Less/TYPO3/_element_pagetree.less
@@ -249,6 +249,7 @@
 		overflow: visible;
 	}
 	.x-btn button {
+		padding: 0;
 		font-size: inherit;
 	}
 }
@@ -275,9 +276,9 @@
 }
 .typo3-pagetree-toppanel-drag-node {
 	cursor: move;
-    padding: 5px;
-    border: none;
-    background: none;
+	padding: 5px;
+	border: none;
+	background: none;
 	font-size: 11px;
 	line-height: 16px;
 }
diff --git a/typo3/sysext/install/Resources/Public/Css/InstallTool.css b/typo3/sysext/install/Resources/Public/Css/InstallTool.css
index d64e8c905252a0ccbe473ff4bdf45cf119f07148..cfae5b75a6714c8f6970b9546da52f30b762f70a 100644
--- a/typo3/sysext/install/Resources/Public/Css/InstallTool.css
+++ b/typo3/sysext/install/Resources/Public/Css/InstallTool.css
@@ -7314,8 +7314,17 @@ button.close {
   margin-bottom: 0;
 }
 .module-docheader .module-docheader-bar .form-group {
+  vertical-align: top;
   margin: 0;
 }
+@media (min-width: 768px) {
+  .module-docheader .module-docheader-bar .form-group {
+    display: inline-block;
+  }
+}
+.module-docheader .module-docheader-bar .form-group .form-control {
+  vertical-align: top;
+}
 .module-docheader .module-docheader-bar .form-inline-spaced {
   margin: 0;
 }
diff --git a/typo3/sysext/t3skin/Resources/Public/Css/backend.css b/typo3/sysext/t3skin/Resources/Public/Css/backend.css
index f09f8efadf8f9e90772fb751593b8fe49d9dbe5b..4656599f14066e2440181a4609f040df10ff1fec 100644
--- a/typo3/sysext/t3skin/Resources/Public/Css/backend.css
+++ b/typo3/sysext/t3skin/Resources/Public/Css/backend.css
@@ -7323,8 +7323,17 @@ button.close {
   margin-bottom: 0;
 }
 .module-docheader .module-docheader-bar .form-group {
+  vertical-align: top;
   margin: 0;
 }
+@media (min-width: 768px) {
+  .module-docheader .module-docheader-bar .form-group {
+    display: inline-block;
+  }
+}
+.module-docheader .module-docheader-bar .form-group .form-control {
+  vertical-align: top;
+}
 .module-docheader .module-docheader-bar .form-inline-spaced {
   margin: 0;
 }
@@ -9235,6 +9244,7 @@ div#contentMenu1 {
   overflow: visible;
 }
 .typo3-pagetree-toppanel .x-btn button {
+  padding: 0;
   font-size: inherit;
 }
 .typo3-pagetree-toppanel-filter {
@@ -10667,7 +10677,7 @@ a.badge-danger:focus {
 }
 .btn-sm,
 .btn-group-sm > .btn {
-  min-height: 26px;
+  height: 26px;
 }
 .btn-group {
   font-size: 0;