diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index 3fa4c31511..3fd3a24c70 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -2773,9 +2773,24 @@ table.egwGridView_outer thead tr th.noResize:hover {
     width: auto;
 }
 
-.et2_toolbar .et2_toolbar_actionlist et2-button.et2_toolbar_onlyCaption::part(label) {
-    position: absolute;
-    left: -999px;
+/* Hide label visually */
+.et2_toolbar et2-button:not(.et2_toolbar_hasCaption)::part(base) {
+	justify-content: center;
+	padding-inline-start: 0;
+}
+
+.et2_toolbar et2-button:not(.et2_toolbar_hasCaption)::part(label) {
+	position: absolute;
+	top: 100%;
+}
+
+.et2_toolbar et2-button:not(.et2_toolbar_hasCaption)::part(prefix) {
+	padding: 0;
+}
+
+.et2_toolbar et2-button.et2_toolbar_onlyCaption::part(label) {
+	position: absolute;
+	left: -999px;
 }
 
 div.et2_toolbar.ui-widget-header {