diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 8e5492bfb..9a87da52f 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -1099,7 +1099,7 @@ class e_form
 					//$edit_query = array('mode' => varset($query['mode']), 'action' => varset($query['action']), 'id' => $id);
 					$query = http_build_query($query);
 
-					$value = "<a href='".e_SELF."?{$query}' title='".LAN_EDIT."'><img class='icon action edit' src='".ADMIN_EDIT_ICON_PATH."' alt='".LAN_EDIT."' /></a>&nbsp;";
+					$value = "<a href='".e_SELF."?{$query}' title='".LAN_EDIT."'><img class='icon action edit list' src='".ADMIN_EDIT_ICON_PATH."' alt='".LAN_EDIT."' /></a>";
 
 					if(varset($parms['deleteClass']))
 					{
diff --git a/e107_themes/_blank/admin_style.css b/e107_themes/_blank/admin_style.css
index eb2d9cef8..a169f6017 100644
--- a/e107_themes/_blank/admin_style.css
+++ b/e107_themes/_blank/admin_style.css
@@ -20,14 +20,19 @@
 .smalltext	{ font-size: 11px; }
 .nowrap		{ white-space:nowrap; }
 
-/* Core Icons */
-img.icon		{ border: 0 }
-img.icon.list	{ margin: 0px 5px 5px 0px }
-img.icon.action { vertical-align: middle }
-img.S16		{ width: 16px; height: 16px }
-img.S32		{ width: 32px; height: 32px }
-img.S64		{ width: 64px; height: 64px }
+/* Core Icons & Image Buttons */
+img.icon		{ border: 0px; vertical-align: middle; }
+img.icon.list, 
+input.action	{ margin: 0px 3px }
+img.icon.action, 
+input.action 	{ }
+img.S16			{ width: 16px; height: 16px }
+img.S32			{ width: 32px; height: 32px }
+img.S64			{ width: 64px; height: 64px }
 img.S128		{ width: 128px; height: 128px }
+img.edit, 
+img.delete, 
+input.delete 	{ }
 /*******************************************************************************************************************/
 
 /* RESET CSS *********************************************************************************************/
diff --git a/e107_themes/jayya/style.css b/e107_themes/jayya/style.css
index fa40d9cc6..35802fd25 100644
--- a/e107_themes/jayya/style.css
+++ b/e107_themes/jayya/style.css
@@ -393,13 +393,17 @@ ul,ol       { list-style:none; }
 
 /* Core Icons */
 img.icon		{ border: 0px }
-img.icon.list	{ margin: 0px 5px 5px 0px }
-img.icon.action { vertical-align: middle }
-img.S16		{ width: 16px; height: 16px }
-img.S32		{ width: 32px; height: 32px }
-img.S64		{ width: 64px; height: 64px }
+img.icon.list, 
+input.action	{ margin: 0px 3px }
+img.icon.action, 
+input.action 	{ vertical-align: middle }
+img.S16			{ width: 16px; height: 16px }
+img.S32			{ width: 32px; height: 32px }
+img.S64			{ width: 64px; height: 64px }
 img.S128		{ width: 128px; height: 128px }
-img.edit	{ margin-right: 5px }
+img.edit, 
+img.delete, 
+input.delete 	{ }
 /*******************************************************************************************************************/
 
 /******** Decorate JS */