diff --git a/e107_admin/frontpage.php b/e107_admin/frontpage.php
index 551cf6516..8270e78e1 100644
--- a/e107_admin/frontpage.php
+++ b/e107_admin/frontpage.php
@@ -411,11 +411,7 @@ class frontpage
 						</td>
 					</tr>";
 					
-					/*
-					<input class='btn ' type='image' src='".ADMIN_UP_ICON_PATH."' title='".FRTLAN_47."' value='".$order."' name='fp_inc".$order."' />
-					<input class='btn ' type='image' src='".ADMIN_DOWN_ICON_PATH."' title='".FRTLAN_48."' value='".$order."' name='fp_dec".$order."' />
-					 <input class='btn delete' type='image' title='".LAN_DELETE."' data-confirm='". LAN_CONFDELETE."' name='fp_delete_rule[".$order."]' src='".ADMIN_DELETE_ICON_PATH."' />
-					 */
+					
 		}
 		$text .= "
 		 		</tbody>
diff --git a/e107_admin/users_extended.php b/e107_admin/users_extended.php
index d9dc03184..16f2d1d3f 100755
--- a/e107_admin/users_extended.php
+++ b/e107_admin/users_extended.php
@@ -910,8 +910,8 @@ class users_ext
 				<div>
 				<input type='hidden' name='eu_action' value='delcat' />
 				<input type='hidden' name='key' value='{$ext['user_extended_struct_id']},{$ext['user_extended_struct_name']}' />
-				<a style='text-decoration:none' href='".e_SELF."?cat.{$ext['user_extended_struct_id']}'>".ADMIN_EDIT_ICON."</a>
-				<input type='image' title='".LAN_DELETE."' name='eudel' src='".ADMIN_DELETE_ICON_PATH."' />
+				<a class='btn btn-default'  href='".e_SELF."?cat.{$ext['user_extended_struct_id']}'>".ADMIN_EDIT_ICON."</a>
+				<button class='btn btn-default action delete' type='submit' title='".LAN_DELETE."' name='eudel' data-confirm='".LAN_JSCONFIRM."' >".ADMIN_DELETE_ICON."</button>
 				</div>
 				</form>
 				</td>
diff --git a/e107_admin/wmessage.php b/e107_admin/wmessage.php
index b8aee0403..6eac55730 100644
--- a/e107_admin/wmessage.php
+++ b/e107_admin/wmessage.php
@@ -150,7 +150,7 @@ if ($action == "main" || $action == "")
 				<td>".r_userclass_name($row['gen_intdata'])."</td>
             	<td class='center nowrap'>
             		<a class='btn btn-large' href='".e_SELF."?create.edit.{$row['gen_id']}'>".ADMIN_EDIT_ICON."</a>
-            		<input class='btn btn-large' type='image' title='".LAN_DELETE."' name='main_delete[".$row['gen_id']."]' src='".ADMIN_DELETE_ICON_PATH."' onclick=\"return jsconfirm('".LAN_CONFIRMDEL." [ID: {$row['gen_id']} ]')\"/>
+            		<button class='btn btn-large action delete' type='submit' title='".LAN_DELETE."' name='main_delete[".$row['gen_id']."]' data-confirm=\"".LAN_CONFIRMDEL." [ID: {$row['gen_id']} ]\" >".ADMIN_DELETE_ICON."</button>
 				</td>
 			</tr>";
 		}
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 44ec03e4b..77e572729 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -1531,39 +1531,36 @@ class e_form
 
 	function submit_image($name, $value, $image, $title='', $options = array())
 	{
+		$tp = e107::getParser();
 		$options = $this->format_options('submit_image', $name, $options);
 		switch ($image)
 		{
 			case 'edit':
-				$image = ADMIN_EDIT_ICON_PATH;
 				$icon = "e-edit-32";
 				$options['class'] = $options['class'] == 'action' ? 'btn btn-default action edit' : $options['class'];
 			break;
 
 			case 'delete':
-				$image = ADMIN_DELETE_ICON_PATH;
 				$icon = "e-delete-32";
 				$options['class'] = $options['class'] == 'action' ? 'btn btn-default action delete' : $options['class'];
 				$options['other'] = 'data-confirm="'.LAN_JSCONFIRM.'"';
 			break;
 
 			case 'execute':
-				$image = ADMIN_EXECUTE_ICON_PATH;
 				$icon = "e-execute-32";
 				$options['class'] = $options['class'] == 'action' ? 'btn btn-default action execute' : $options['class'];
 			break;
 
 			case 'view':
-				$image = ADMIN_VIEW_ICON_PATH;
 				$icon = "e-view-32";
 				$options['class'] = $options['class'] == 'action' ? 'btn btn-default action view' : $options['class'];
 			break;
 		}
 		$options['title'] = $title;//shorthand
 		
-		return  "<button type='submit' name='{$name}' data-placement='left' value='{$value}'".$this->get_attributes($options, $name, $value)."  ><i class='S32 {$icon}'></i></button>";
+		return  "<button type='submit' name='{$name}' data-placement='left' value='{$value}'".$this->get_attributes($options, $name, $value)."  >".$tp->toIcon($icon)."</button>";
 
-	//	return "<input class='e-tip S16 {$icon} btn btn-large' data-placement='left' type='image' src='{$image}' name='{$name}' value='{$value}'".$this->get_attributes($options, $name, $value)." />";
+	
 	}
 
 	/**
diff --git a/e107_images/admin_images/delete_16.png b/e107_images/admin_images/delete_16.png
new file mode 100644
index 000000000..dfb80b2e5
Binary files /dev/null and b/e107_images/admin_images/delete_16.png differ
diff --git a/e107_images/admin_images/delete_32.png b/e107_images/admin_images/delete_32.png
new file mode 100644
index 000000000..b953dd7e3
Binary files /dev/null and b/e107_images/admin_images/delete_32.png differ
diff --git a/e107_plugins/gsitemap/admin_config.php b/e107_plugins/gsitemap/admin_config.php
index a023334d0..2a8a949f1 100644
--- a/e107_plugins/gsitemap/admin_config.php
+++ b/e107_plugins/gsitemap/admin_config.php
@@ -164,8 +164,8 @@ class gsitemap
 
 				<td class='center' style='white-space:nowrap'>
 				<div>
-				<input type='image' name='edit[{$row2['gsitemap_id']}]' value='edit' src='".ADMIN_EDIT_ICON_PATH."' alt='".LAN_EDIT."' title='".LAN_EDIT."' style='border:0px' />
-				<input type='image' name='delete[{$row2['gsitemap_id']}]' value='del' onclick=\"return jsconfirm('".$tp->toJS(LAN_CONFIRMDEL." [".$row2['gsitemap_name']."]")."') \" src='".ADMIN_DELETE_ICON_PATH."' alt='".LAN_DELETE."' title='".LAN_DELETE."' style='border:0px' />
+				<button class='btn btn-default' type='submit' name='edit[{$row2['gsitemap_id']}]' value='edit' src='".ADMIN_EDIT_ICON_PATH."' alt='".LAN_EDIT."' title='".LAN_EDIT."' style='border:0px' />
+				<button class='btn btn-default action delete' type='submit' name='delete[{$row2['gsitemap_id']}]' value='del' data-confirm='".$tp->toJS(LAN_CONFIRMDEL." [".$row2['gsitemap_name']."]")."' title='".LAN_DELETE."' >".ADMIN_DELETE_ICON."</button>
 				</div>
 				</td>
 				</tr>
diff --git a/e107_plugins/poll/admin_config.php b/e107_plugins/poll/admin_config.php
index e343201f6..4ff91eed8 100644
--- a/e107_plugins/poll/admin_config.php
+++ b/e107_plugins/poll/admin_config.php
@@ -202,8 +202,8 @@ function poll_list()
 				
 				$text .= "
 				<td class='center' style='white-space:nowrap'>
-					<input class='btn btn-large' type='image' name='edit[{$poll_id}]' value='edit' src='".ADMIN_EDIT_ICON_PATH."' alt='".LAN_EDIT."' title='".LAN_EDIT."' style='border:0px' />
-					<input class='btn btn-large' type='image' name='delete[$poll_id]' value='del' onclick=\"return jsconfirm('".$tp->toJS(LAN_CONFIRMDEL." [".$poll_id."]")."') \" src='".ADMIN_DELETE_ICON_PATH."' alt='".LAN_DELETE."' title='".LAN_DELETE."' style='border:0px' />
+					<button class='btn btn-large' type='submit' name='edit[{$poll_id}]' value='edit' alt='".LAN_EDIT."' title='".LAN_EDIT."' >".ADMIN_EDIT_ICON."</button>
+					<button class='btn btn-large action delete' type='submit' name='delete[$poll_id]' value='del' onclick=\"return jsconfirm('".$tp->toJS(LAN_CONFIRMDEL." [".$poll_id."]")."') \" title='".LAN_DELETE."' >".ADMIN_DELETE_ICON."</button>
 				</td>
 			</tr>";
 		}