diff --git a/core/css/header.scss b/core/css/header.scss
index b1141476a0..95632ade4a 100644
--- a/core/css/header.scss
+++ b/core/css/header.scss
@@ -49,7 +49,7 @@
 	left: 0;
 	right: 0;
 	z-index: 2000;
-	height: 45px;
+	height: 50px;
 	background-color: $color-primary;
 	box-sizing: border-box;
 	justify-content: space-between;
@@ -57,10 +57,8 @@
 
 /* LOGO and APP NAME -------------------------------------------------------- */
 #nextcloud {
-	padding: 5px;
-	padding-bottom: 0;
-	height: 45px;
-	/* header height */
+	padding: 8px 5px;
+	height: 100%;
 	box-sizing: border-box;
 	opacity: 1;
 	&:focus {
@@ -82,8 +80,8 @@
 		position: absolute;
 		max-width: 350px;
 		max-height: 280px;
-		right: 0;
-		top: 44px;
+		right: 12px;
+		top: 50px;
 		margin: 0;
 
 		&:not(.popovermenu) {
@@ -167,10 +165,11 @@
 				justify-content: center;
 				align-items: center;
 				width: 44px;
-				height: 44px;
+				height: 100%;
 				cursor: pointer;
 				opacity: 0.6;
 				padding: 0;
+				padding-right: 12px;
 				margin: 0;
 			}
 		}
@@ -340,9 +339,9 @@ nav[role='navigation'] {
 
 #settings {
 	display: inline-block;
+	height: 100%;
 	color: rgba($color-primary-text, 0.7);
 	cursor: pointer;
-	margin-right: 13px;
 	flex: 0 0 auto;
 
 	/* User menu on the right */
@@ -439,8 +438,9 @@ nav[role='navigation'] {
 #appmenu {
 	display: inline-block;
 	width: auto;
-	clear: both;
 	min-width: 88px;
+	height: 100%;
+	clear: both;
 
 	li {
 		float: left;
@@ -454,8 +454,8 @@ nav[role='navigation'] {
 			position: relative;
 			display: inline-block;
 			margin: 0;
-			padding: 12px;
-			height: 21px;
+			padding: 15px 12px;
+			height: 20px;
 			text-align: center;
 			vertical-align: top !important;
 			opacity: .6;
@@ -496,7 +496,7 @@ nav[role='navigation'] {
 		border-radius: $border-radius;
 		border-top-left-radius: 0;
 		border-top-right-radius: 0;
-		margin-top: 0;
+		margin-top: 5px;
 		color: rgba($color-main-text, .7);
 		width: auto;
 		left: 50%;
diff --git a/core/css/mobile.scss b/core/css/mobile.scss
index ebc7e094cd..c7db11919f 100644
--- a/core/css/mobile.scss
+++ b/core/css/mobile.scss
@@ -136,8 +136,6 @@ table.multiselect thead {
 	#header .header-right .menu {
 		max-width: calc(100vw - 26px);
 		position: fixed;
-		right: 13px;
-		top: 45px;
 		&::after {
 			display: none !important;
 		}
diff --git a/core/css/styles.scss b/core/css/styles.scss
index 0b15718eef..134ee9476d 100644
--- a/core/css/styles.scss
+++ b/core/css/styles.scss
@@ -207,10 +207,11 @@ body {
 		& ~ .icon-close-white {
 			display: inline;
 			position: absolute;
-			width: 15px;
-			height: 32px;
-			right: 3px;
+			width: 30px;
+			height: 100%;
+			right: 0;
 			top: 0;
+			margin: 0;
 			&, &:focus, &:active, &:hover {
 				border: none;
 				background-color: transparent;
@@ -287,7 +288,7 @@ body {
 	width: 100%;
 	overflow-x: hidden;
 	/* prevent horizontal scrollbar */
-	padding-top: 45px;
+	padding-top: 50px;
 	box-sizing: border-box;
 }