diff --git a/e107_core/templates/admin_icons_template.php b/e107_core/templates/admin_icons_template.php
index 9ee81afa9..3ccea6ad9 100644
--- a/e107_core/templates/admin_icons_template.php
+++ b/e107_core/templates/admin_icons_template.php
@@ -440,14 +440,25 @@ if (!defined('E_16_FAILEDLOGIN')) {
 define("E_32_TRUE", "<i class='S32 e-true-32'></i>");
 
 
+/*
+	define("ADMIN_TRUE_ICON", "<i class='fa fa-check text-success'></i>");
+	define("ADMIN_FALSE_ICON", "<i class='fa fa-times text-danger'></i>");
+	define("ADMIN_WARNING_ICON", "<i class='fa fa-warning text-warning'></i>");
+
+	define("ADMIN_EDIT_ICON", "<i class='fa fa-edit fa-2x fa-fw'></i>");
+	define("ADMIN_DELETE_ICON", "<i class='fa fa-trash fa-2x fa-fw'></i>");
+	define("ADMIN_EXECUTE_ICON", "<i class='fa fa-power-off fa-2x fa-fw'></i>");
+	define("ADMIN_SORT_ICON", "<i class='fa fa-sort fa-2x fa-fw'></i>");
+*/
 
 	define("ADMIN_TRUE_ICON", "<i class='S16 e-true-16'></i>");
 	define("ADMIN_FALSE_ICON", "<i class='S16 e-false-16'></i>");
 	define("ADMIN_WARNING_ICON", "<i class='S16 e-warning-16'></i>");
-
 	define("ADMIN_EDIT_ICON", "<i class='S32 e-edit-32'></i>");
 	define("ADMIN_DELETE_ICON", "<i class='S32 e-delete-32'></i>");
 
+
+
 	define("ADMIN_ADD_ICON", "<i class='S32 e-add-32'></i>");
 	define("ADMIN_INFO_ICON", "<i class='S16 e-info-16'></i>");
 	define("ADMIN_CONFIGURE_ICON", "<i class='S32 e-settings-32'></i>");
@@ -463,6 +474,7 @@ define("E_32_TRUE", "<i class='S32 e-true-32'></i>");
 	define("ADMIN_EXECUTE_ICON", "<i class='S32 e-execute-32'></i>");
 
 
+
 	// FOR BC 
 
 	define("ADMIN_EDIT_ICON_PATH", e_IMAGE_ABS."admin_images/edit_32.png");
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index e68c38d06..5be9d7986 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -2763,29 +2763,29 @@ e107::getDebug()->log($sc_parameters);
 		switch ($image)
 		{
 			case 'edit':
-				$icon = "e-edit-32";
+				$icon = (e_ADMIN_AREA === true) ? ADMIN_EDIT_ICON : $tp->toIcon("e-edit-32");
 				$options['class'] = $options['class'] == 'action' ? 'btn btn-default action edit' : $options['class'];
 			break;
 
 			case 'delete':
-				$icon = (e_ADMIN_AREA === true) ? "e-delete-32" : 'fa-trash.glyph';
+				$icon = (e_ADMIN_AREA === true) ? ADMIN_DELETE_ICON : $tp->toIcon('fa-trash.glyph');
 				$options['class'] = $options['class'] == 'action' ? 'btn btn-default action delete' : $options['class'];
 				$options['other'] = 'data-confirm="'.LAN_JSCONFIRM.'"';
 			break;
 
 			case 'execute':
-				$icon = "e-execute-32";
+				$icon = (e_ADMIN_AREA === true) ? ADMIN_EXECUTE_ICON : $tp->toIcon('fa-power-off.glyph');
 				$options['class'] = $options['class'] == 'action' ? 'btn btn-default action execute' : $options['class'];
 			break;
 
 			case 'view':
-				$icon = "e-view-32";
+				$icon = $tp->toIcon("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)."  >".$tp->toIcon($icon)."</button>";
+		return  "<button type='submit' name='{$name}' data-placement='left' value='{$value}'".$this->get_attributes($options, $name, $value)."  >".$icon."</button>";
 
 	
 	}