diff --git a/admin/templates/default/mailaccount.xet b/admin/templates/default/mailaccount.xet
index b44a5837b6..90e23b94a5 100644
--- a/admin/templates/default/mailaccount.xet
+++ b/admin/templates/default/mailaccount.xet
@@ -22,7 +22,8 @@
 					<description for="ident_realname" value="Your name"/>
 					<hbox span="all">
 						<textbox id="ident_realname" size="90" maxlength="128"/>
-						<buttononly label="Placeholders" id="button[placeholders]" onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_merge.show_replacements&amp;nonavbar=1'),'_blank','dependent=yes,width=860,height=620,scrollbars=yes,status=yes'); return false;" options="dialog_help"/>
+						<buttononly label="Placeholders" id="button[placeholders]" image="question-circle"
+							onclick="window.open(egw::link('/index.php','menuaction=addressbook.addressbook_merge.show_replacements&amp;nonavbar=1'),'_blank','dependent=yes,width=860,height=620,scrollbars=yes,status=yes'); return false;"/>
 					</hbox>
 				</row>
 				<row>
diff --git a/api/etemplate.php b/api/etemplate.php
index bad00a74ac..b11197d324 100644
--- a/api/etemplate.php
+++ b/api/etemplate.php
@@ -324,17 +324,10 @@ function send_template()
 				unset($attrs['novalidation']);
 				$attrs['noValidation'] = 'true';
 			}
-			// replace not set background_image attribute with et2-image tag, if not in NM / lists
-			if (!empty($attrs['image']) && (empty($attrs['background_image']) || $attrs['background_image'] === 'false') &&
-				!preg_match('/^(index|list)/', $name))
+			// replace not set background_image attribute with et2-button-icon tag, if not in NM / lists
+			if (!empty($attrs['image']) && (empty($attrs['background_image']) || $attrs['background_image'] === 'false'))
 			{
 				$tag = 'et2-button-icon';
-				if (!isset($attrs['name']))
-				{
-					$attrs['name'] = $attrs['image'];
-					unset($attrs['image']);
-					$attrs['library'] = 'egw';
-				}
 			}
 			unset($attrs['background_image']);
 			return "<$tag " . stringAttrs($attrs) . '></' . $tag . '>';
@@ -390,11 +383,9 @@ function send_template()
 				unset($attrs['class']);
 			}
 
-			// Change size=# attribute to width, size is small|medium|large with Shoelace
-			// Do not drop size if we're setting shoelace size format in the template
-			if (isset($attrs['size']) && !preg_match('/small|medium|large/',$attrs['size']))
+			// Drop all (old) size attributes, if it's not shoelace size format: small, medium or large
+			if (isset($attrs['size']) && !in_array($attrs['size'], ['small', 'medium', 'large']))
 			{
-				$attrs['width'] = (int)$attrs['size'].'em';
 				unset($attrs['size']);
 			}