diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index 7d4af389af..5367fa9a16 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -6697,8 +6697,6 @@ span.egw_tutorial_title {
     position: absolute;
     display: none;
     z-index: 999;
-    -webkit-overflow-scrolling: touch;
-    overflow-y: scroll;
   }
   body .egw_fw_mobile_popup_container .egw_fw_mobile_popupFrame {
     width: 100%;
diff --git a/pixelegg/css/mobile.less b/pixelegg/css/mobile.less
index 7410e38ec7..0cc3ccc173 100644
--- a/pixelegg/css/mobile.less
+++ b/pixelegg/css/mobile.less
@@ -793,8 +793,6 @@
 			position:absolute;
 			display: none;
 			z-index: 999;
-			-webkit-overflow-scrolling: touch;
-			overflow-y:scroll;
 			.egw_fw_mobile_popupFrame {
 				width: 100%;
 				height: 100%;
diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css
index 8d629e9005..837932081d 100644
--- a/pixelegg/mobile/fw_mobile.css
+++ b/pixelegg/mobile/fw_mobile.css
@@ -6708,8 +6708,6 @@ span.egw_tutorial_title {
     position: absolute;
     display: none;
     z-index: 999;
-    -webkit-overflow-scrolling: touch;
-    overflow-y: scroll;
   }
   body .egw_fw_mobile_popup_container .egw_fw_mobile_popupFrame {
     width: 100%;
@@ -7742,6 +7740,9 @@ form[id^="tracker-"] .dialogHeadbar {
   }
   body .popupMainDiv {
     padding-top: 60px !important;
+    padding-left: 8px;
+    padding-right: 8px;
+    overflow-x: hidden;
     /* Exceptional cases to not get the general left padding*/
   }
   body .popupMainDiv * {
@@ -7838,6 +7839,9 @@ form[id^="tracker-"] .dialogHeadbar {
   body .popupMainDiv form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input {
     margin: 0 5px 0 0;
   }
+  body div#popupMainDiv {
+    padding: 0;
+  }
   body .dialogHeadbar button[class*="et2_button_with_image"]:not([class*="et2_toolbar_hasCaption"]) {
     -webkit-filter: brightness(0) invert(1) !important;
     filter: brightness(0) invert(1) !important;
@@ -8040,7 +8044,7 @@ form[id^="tracker-"] .dialogHeadbar {
   }
   body .et2_searchbox.expanded input {
     width: 100%;
-    height: 45px;
+    height: 42px;
     margin: 0;
     top: 0;
     outline: none;
@@ -8051,12 +8055,11 @@ form[id^="tracker-"] .dialogHeadbar {
     top: 0px;
     left: -50px;
     background-color: white;
-    height: 49px;
+    height: 50px;
     width: 50px;
     background-image: url("../images/cancelled.svg");
     background-position: center;
     background-repeat: no-repeat;
-    border-bottom: 1px solid #e6e6e6;
     background-size: 24px 24px;
   }
   body .et2_searchbox.expanded .flex {
diff --git a/pixelegg/mobile/fw_mobile.less b/pixelegg/mobile/fw_mobile.less
index eec1b1a23e..2faccc5d54 100644
--- a/pixelegg/mobile/fw_mobile.less
+++ b/pixelegg/mobile/fw_mobile.less
@@ -889,6 +889,9 @@
 		.et2_button_icon {height:32px;}
 		.popupMainDiv {
 			padding-top: 60px !important;
+			padding-left:8px;
+			padding-right:8px;
+			overflow-x:hidden;
 			* {
 				.mob-fontsize-n;
 				font-family: Verdana, "Lucida Grande", Helvetica, Sans-Serif;
@@ -968,6 +971,7 @@
 
 			form.et2_container div table.et2_grid tbody tr .row td .et2_box_widget input {margin:0 5px 0 0;}
 		}
+		div#popupMainDiv {padding:0;}
 		.dialogHeadbar {
 			button[class*="et2_button_with_image"]:not([class*="et2_toolbar_hasCaption"]) {
 				.white-svg;
@@ -1191,7 +1195,7 @@
 			}
 			input {
 				width:100%;
-				height:45px;
+				height:42px;
 				margin:0;
 				top:0;
 				outline: none;
@@ -1202,12 +1206,11 @@
 				top: 0px;
 				left: -50px;
 				background-color: white;
-				height: 49px;
+				height: 50px;
 				width: 50px;
 				background-image: url("../images/cancelled.svg");
 				background-position: center;
 				background-repeat: no-repeat;
-				border-bottom: 1px solid #e6e6e6;
 				background-size: 24px 24px;
 			}
 			.flex{