diff --git a/api/etemplate.php b/api/etemplate.php
index eb4f794819..8301dc0fe3 100644
--- a/api/etemplate.php
+++ b/api/etemplate.php
@@ -318,6 +318,7 @@ function send_template()
 			{
 				$tag = 'et2-image';
 				$attrs['src'] = $attrs['image'];
+				$attrs['class'] = (!empty($attrs['class']) ? $attrs['class'].' ':'').'imageButton';
 				unset($attrs['image']);
 				// Was expected to submit.  Images don't have noValidation, so add directly
 				if (!array_key_exists('onclick', $attrs) && empty($attrs['noSubmit']))
diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index d1af126998..e5d9826459 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -358,6 +358,13 @@ a.et2_url.url {
     margin-left: 0px;
 }
 
+/**
+ * Former button without background_image --> <et2-image class="et2-image-button"
+ */
+et2-image.imageButton {
+    height: 20px;
+    vertical-align: middle;}
+
 /**
  * Button widget - text only, and icon
  */