diff --git a/phpgwapi/inc/class.html.inc.php b/phpgwapi/inc/class.html.inc.php
index 36353b8e2f..dc28bcb940 100644
--- a/phpgwapi/inc/class.html.inc.php
+++ b/phpgwapi/inc/class.html.inc.php
@@ -694,6 +694,14 @@ egw_LAB.wait(function() {
 				$path = $image;		// name may already contain absolut path
 			}
 			$image = ' src="'.$path.'"';
+			if (strpos($options, 'class="') !== false)
+			{
+				$options = str_replace('class="', 'class="image_button ', $options);
+			}
+			else
+			{
+				$options .= ' class="image_button"';
+			}
 		}
 		if (!$no_lang)
 		{
@@ -704,7 +712,7 @@ egw_LAB.wait(function() {
 		{
 			$label_u = str_replace('&'.$accesskey[1],'<u>'.$accesskey[1].'</u>',$label);
 			$label = str_replace('&','',$label);
-			$options = 'accesskey="'.$accesskey[1].'" '.$options;
+			$options .= ' accesskey="'.$accesskey[1].'" '.$options;
 		}
 		else
 		{
diff --git a/phpgwapi/templates/idots/css/traditional.css b/phpgwapi/templates/idots/css/traditional.css
index 592a7ba93a..397b930668 100755
--- a/phpgwapi/templates/idots/css/traditional.css
+++ b/phpgwapi/templates/idots/css/traditional.css
@@ -980,3 +980,8 @@ div.admin-config form > table tr.th td{
 div.admin-config form > table td {
 	padding-left: 5px;
 }
+
+button.image_button {
+	background: none;
+	border: none;
+}