diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css
index 6d47c4fb4e..e52ad0e9da 100644
--- a/pixelegg/mobile/fw_mobile.css
+++ b/pixelegg/mobile/fw_mobile.css
@@ -8967,14 +8967,26 @@ table.egwGridView_grid img.et2_appicon {
   body div#popupMainDiv {
     padding: 0;
   }
-  body .dialogHeadbar et2-button-icon {
+  body .dialogHeadbar et2-button-icon,
+  body .dialogHeadbar et2-button {
     font-size: 2.3em;
+    flex: 0 0 50px;
+  }
+  body .dialogHeadbar et2-button-icon et2-image,
+  body .dialogHeadbar et2-button et2-image {
+    height: 24px;
+    width: 24px;
+    max-width: initial;
     -webkit-filter: brightness(0) invert(1) !important;
     filter: brightness(0) invert(1) !important;
     background-color: transparent !important;
     background-size: 24px 24px !important;
     border: none;
   }
+  body .dialogHeadbar et2-button::part(base) {
+    background: transparent;
+    border: transparent;
+  }
   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;
diff --git a/pixelegg/mobile/fw_mobile.less b/pixelegg/mobile/fw_mobile.less
index 419f913f2c..e49c3b6a03 100644
--- a/pixelegg/mobile/fw_mobile.less
+++ b/pixelegg/mobile/fw_mobile.less
@@ -1227,15 +1227,29 @@
 			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 {
-			et2-button-icon {
-				font-size: 2.3em;
-				.white-svg;
-			}
-			button[class*="et2_button_with_image"]:not([class*="et2_toolbar_hasCaption"]) {
-				.white-svg;
-				padding-right: 15px;
+		  et2-button-icon, et2-button {
+			font-size: 2.3em;
+			flex: 0 0 50px;
+
+			et2-image {
+			  height: 24px;
+			  width: 24px;
+			  max-width: initial;
+			  .white-svg;
 			}
+		  }
+
+		  et2-button::part(base) {
+			background: transparent;
+			border: transparent;
+		  }
+
+		  button[class*="et2_button_with_image"]:not([class*="et2_toolbar_hasCaption"]) {
+			.white-svg;
+			padding-right: 15px;
+		  }
 		}
 		.rowHeader {
 			.mob-fontsize-l;