diff --git a/admin-dev/themes/default/template/helpers/list/list_action_addstock.tpl b/admin-dev/themes/default/template/helpers/list/list_action_addstock.tpl
index 5a593025f..59ab663cc 100644
--- a/admin-dev/themes/default/template/helpers/list/list_action_addstock.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_action_addstock.tpl
@@ -22,6 +22,6 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<a href="{$href}" title="{$action}" class="">
+<a href="{$href}" title="{$action}">
 	<i class="icon-circle-arrow-up"></i> {$action}
 </a>
diff --git a/admin-dev/themes/default/template/helpers/list/list_action_default.tpl b/admin-dev/themes/default/template/helpers/list/list_action_default.tpl
index f5b1473b8..8d760ab19 100644
--- a/admin-dev/themes/default/template/helpers/list/list_action_default.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_action_default.tpl
@@ -22,6 +22,6 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<a href="{$href}" class="" title="{$action}" {if isset($name)}name="{$name}"{/if}>
+<a href="{$href}" title="{$action}" {if isset($name)}name="{$name}"{/if}>
 	<i class="icon-asterisk"></i> {$action}
 </a>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/helpers/list/list_action_delete.tpl b/admin-dev/themes/default/template/helpers/list/list_action_delete.tpl
index bcb213af7..b0d4cc0e3 100644
--- a/admin-dev/themes/default/template/helpers/list/list_action_delete.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_action_delete.tpl
@@ -22,6 +22,6 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<a href="{$href}" class="" {if isset($confirm)}onclick="if (confirm('{$confirm}')){ return true; }else{ event.stopPropagation(); event.preventDefault();};"{/if} title="{$action}">
+<a href="{$href}" {if isset($confirm)}onclick="if (confirm('{$confirm}')){ return true; }else{ event.stopPropagation(); event.preventDefault();};"{/if} title="{$action}">
 	<i class="icon-trash"></i> {$action}
 </a>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/helpers/list/list_action_details.tpl b/admin-dev/themes/default/template/helpers/list/list_action_details.tpl
index 113ceed3e..e9dac3669 100644
--- a/admin-dev/themes/default/template/helpers/list/list_action_details.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_action_details.tpl
@@ -23,6 +23,6 @@
 *  International Registered Trademark & Property of PrestaShop SA
 *}
 
-<a href="#" class="" id="details_{$params.action}_{$id}" title="{$action}" onclick="display_action_details('{$id}', '{$controller}', '{$token}', '{$params.action}', {$json_params|escape}); return false">
+<a href="#" id="details_{$params.action}_{$id}" title="{$action}" onclick="display_action_details('{$id}', '{$controller}', '{$token}', '{$params.action}', {$json_params|escape}); return false">
 	<i class="icon-collapse"></i> {$action}
 </a>
diff --git a/admin-dev/themes/default/template/helpers/list/list_action_duplicate.tpl b/admin-dev/themes/default/template/helpers/list/list_action_duplicate.tpl
index 0b575a2f7..3ad8780a4 100644
--- a/admin-dev/themes/default/template/helpers/list/list_action_duplicate.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_action_duplicate.tpl
@@ -22,6 +22,6 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<a href="#" class="" title="{$action}" onclick="if (confirm('{$confirm}')) document.location = '{$location_ok}'; else document.location = '{$location_ko}'; return false;">
+<a href="#" title="{$action}" onclick="if (confirm('{$confirm}')) document.location = '{$location_ok}'; else document.location = '{$location_ko}'; return false;">
 	<i class="icon-copy"></i> {$action}
 </a>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/helpers/list/list_action_edit.tpl b/admin-dev/themes/default/template/helpers/list/list_action_edit.tpl
index 53c0f76b1..cd015f481 100644
--- a/admin-dev/themes/default/template/helpers/list/list_action_edit.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_action_edit.tpl
@@ -22,6 +22,6 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<a href="{$href}" class="" title="{$action}">
+<a href="{$href}" title="{$action}" class="edit">
 	<i class="icon-pencil"></i> {$action}
 </a>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/helpers/list/list_action_removestock.tpl b/admin-dev/themes/default/template/helpers/list/list_action_removestock.tpl
index 151344629..93ad30413 100644
--- a/admin-dev/themes/default/template/helpers/list/list_action_removestock.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_action_removestock.tpl
@@ -22,6 +22,6 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<a href="{$href}" title="{$action}" class="">
+<a href="{$href}" title="{$action}">
 	<i class="icon-circle-arrow-down"></i> {$action}
 </a>
diff --git a/admin-dev/themes/default/template/helpers/list/list_action_supplier_order_receipt.tpl b/admin-dev/themes/default/template/helpers/list/list_action_supplier_order_receipt.tpl
index 1797455a4..3bff90eb1 100644
--- a/admin-dev/themes/default/template/helpers/list/list_action_supplier_order_receipt.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_action_supplier_order_receipt.tpl
@@ -22,6 +22,6 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<a href="{$href}" title="{$action}" class="">
+<a href="{$href}" title="{$action}">
 	<i class="icon-truck"></i> {$action}
 </a>
diff --git a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_change_state.tpl b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_change_state.tpl
index afa90d014..3b5f02d2e 100644
--- a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_change_state.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_change_state.tpl
@@ -22,6 +22,6 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<a href="{$href}" title="{$action}" class="">
+<a href="{$href}" title="{$action}">
 	<i class="icon-time"></i> {$action}
 </a>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_create_from_template.tpl b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_create_from_template.tpl
index accaf1054..66e36e7ca 100644
--- a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_create_from_template.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_create_from_template.tpl
@@ -22,6 +22,6 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<a href="{$href}" class="" onclick="return confirm('{$confirm}');" title="{$action}">
+<a href="{$href}" onclick="return confirm('{$confirm}');" title="{$action}">
 	<i class="icon-copy"></i> {$action}
 </a>
diff --git a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_receipt.tpl b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_receipt.tpl
index 8c7b0acb1..1e891d92f 100644
--- a/admin-dev/themes/default/template/helpers/list/list_action_supply_order_receipt.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_action_supply_order_receipt.tpl
@@ -22,6 +22,6 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<a href="{$href}" class="" title="{$action}">
+<a href="{$href}" title="{$action}">
 	<i class="icon-truck"></i> {$action}
 </a>
\ No newline at end of file
diff --git a/admin-dev/themes/default/template/helpers/list/list_action_transferstock.tpl b/admin-dev/themes/default/template/helpers/list/list_action_transferstock.tpl
index 427f06513..3a6699f17 100644
--- a/admin-dev/themes/default/template/helpers/list/list_action_transferstock.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_action_transferstock.tpl
@@ -22,6 +22,6 @@
 *  @license    http://opensource.org/licenses/afl-3.0.php  Academic Free License (AFL 3.0)
 *  International Registered Trademark & Property of PrestaShop SA
 *}
-<a href="{$href}" class="" title="{$action}">
+<a href="{$href}" title="{$action}">
 	<i class="icon-exchange"></i> {$action}
 </a>
diff --git a/admin-dev/themes/default/template/helpers/list/list_content.tpl b/admin-dev/themes/default/template/helpers/list/list_content.tpl
index 3d09f9520..b730d8ba4 100644
--- a/admin-dev/themes/default/template/helpers/list/list_content.tpl
+++ b/admin-dev/themes/default/template/helpers/list/list_content.tpl
@@ -147,7 +147,7 @@
 			{/foreach}
 			{if $compiled_actions|count > 0}
 			<div class="btn-group{if $compiled_actions|count > 1} btn-group-action{/if}">
-				{$compiled_actions[0]|replace:'class=""':'class="btn btn-default btn-small"'}
+				{$compiled_actions[0]|regex_replace:'/class\s*=\s*"(\w*)"/':'class="$1 btn btn-default"'}
 				{if $compiled_actions|count > 1}
 				<button class="btn btn-default btn-small dropdown-toggle" data-toggle="dropdown">
 					<span class="caret"></span>&nbsp;