diff --git a/controllers/admin/AdminAddressesController.php b/controllers/admin/AdminAddressesController.php
index e5f92bcdb..ed96e934b 100644
--- a/controllers/admin/AdminAddressesController.php
+++ b/controllers/admin/AdminAddressesController.php
@@ -389,6 +389,4 @@ class AdminAddressesControllerCore extends AdminController
 
 		parent::initContent();
 	}
-}
-
-
+}
\ No newline at end of file
diff --git a/controllers/admin/AdminAliasesController.php b/controllers/admin/AdminAliasesController.php
index 7ccb45ef3..fcbac70ad 100644
--- a/controllers/admin/AdminAliasesController.php
+++ b/controllers/admin/AdminAliasesController.php
@@ -31,11 +31,12 @@ class AdminAliasesControllerCore extends AdminController
 	{
 	 	$this->table = 'alias';
 		$this->className = 'Alias';
-	 	$this->edit = true;
-		$this->delete = true;
 	 	$this->lang = false;
 		$this->requiredDatabase = true;
 
+		$this->addRowAction('edit');
+		$this->addRowAction('delete');
+
 		$this->context = Context::getContext();
 
 		if (!Tools::getValue('realedit'))
diff --git a/controllers/admin/AdminGendersController.php b/controllers/admin/AdminGendersController.php
index ef1f19f36..a9dc595aa 100644
--- a/controllers/admin/AdminGendersController.php
+++ b/controllers/admin/AdminGendersController.php
@@ -32,10 +32,11 @@ class AdminGendersController extends AdminController
 	 	$this->table = 'gender';
 		$this->className = 'Gender';
 		$this->lang = true;
-		$this->edit = true;
-		$this->delete = true;
 		$this->requiredDatabase = true;
 
+		$this->addRowAction('edit');
+		$this->addRowAction('delete');
+
 		$this->context = Context::getContext();
 
 		if (!Tools::getValue('realedit'))
diff --git a/controllers/admin/AdminGroupShopController.php b/controllers/admin/AdminGroupShopController.php
index 7777a2d1a..86ffb04a6 100644
--- a/controllers/admin/AdminGroupShopController.php
+++ b/controllers/admin/AdminGroupShopController.php
@@ -32,10 +32,10 @@ class AdminGroupShopControllerCore extends AdminController
 		$this->table = 'group_shop';
 		$this->className = 'GroupShop';
 		$this->lang = false;
-		$this->edit = true;
-		$this->delete = false;
 		$this->requiredDatabase = true;
 
+		$this->addRowAction('edit');
+
 		$this->context = Context::getContext();
 
 		if (!Tools::getValue('realedit'))
diff --git a/controllers/admin/AdminImagesController.php b/controllers/admin/AdminImagesController.php
index 735dc4f2b..1df93bbbd 100644
--- a/controllers/admin/AdminImagesController.php
+++ b/controllers/admin/AdminImagesController.php
@@ -35,8 +35,9 @@ class AdminImagesController extends AdminController
 		$this->table = 'image_type';
 		$this->className = 'ImageType';
 		$this->lang = false;
-		$this->edit = true;
-	 	$this->delete = true;
+
+	 	$this->addRowAction('edit');
+		$this->addRowAction('delete');
 
 		$this->fieldsDisplay = array(
 			'id_image_type' => array('title' => $this->l('ID'), 'align' => 'center', 'width' => 25),
diff --git a/controllers/admin/AdminOrderMessageController.php b/controllers/admin/AdminOrderMessageController.php
index 6f89e7553..be07d3185 100644
--- a/controllers/admin/AdminOrderMessageController.php
+++ b/controllers/admin/AdminOrderMessageController.php
@@ -32,10 +32,11 @@ class AdminOrderMessageController extends AdminController
 	 	$this->table = 'order_message';
 		$this->className = 'OrderMessage';
 	 	$this->lang = true;
-	 	$this->edit = true;
-	 	$this->delete = true;
 		$this->requiredDatabase = true;
 
+		$this->addRowAction('edit');
+		$this->addRowAction('delete');
+
 		$this->context = Context::getContext();
 
 		if (!Tools::getValue('realedit'))
diff --git a/controllers/admin/AdminQuickAccessesController.php b/controllers/admin/AdminQuickAccessesController.php
index 94200d882..67e688284 100644
--- a/controllers/admin/AdminQuickAccessesController.php
+++ b/controllers/admin/AdminQuickAccessesController.php
@@ -32,10 +32,11 @@ class AdminQuickAccessesController extends AdminController
 	 	$this->table = 'quick_access';
 		$this->className = 'QuickAccess';
 	 	$this->lang = true;
-	 	$this->edit = true;
-	 	$this->delete = true;
 		$this->requiredDatabase = true;
 
+		$this->addRowAction('edit');
+		$this->addRowAction('delete');
+
 		$this->context = Context::getContext();
 
 		if (!Tools::getValue('realedit'))
diff --git a/controllers/admin/AdminRequestSqlController.php b/controllers/admin/AdminRequestSqlController.php
index 9630fa7e1..59dfe4f76 100644
--- a/controllers/admin/AdminRequestSqlController.php
+++ b/controllers/admin/AdminRequestSqlController.php
@@ -32,11 +32,13 @@ class AdminRequestSqlControllerCore extends AdminController
 		$this->table = 'request_sql';
 		$this->className = 'RequestSql';
 	 	$this->lang = false;
-	 	$this->edit = true;
-	 	$this->delete = true;
-		$this->view = true;
 		$this->export = true;
 		$this->requiredDatabase = true;
+
+		$this->addRowAction('view');
+		$this->addRowAction('edit');
+		$this->addRowAction('delete');
+
 		$this->context = Context::getContext();
 	 	$this->bulk_actions = array('delete' => array('text' => $this->l('Delete selected'), 'confirm' => $this->l('Delete selected items?')),
 	 								'export' => array('text' => $this->l('Export selected')));
diff --git a/controllers/admin/AdminSearchEnginesController.php b/controllers/admin/AdminSearchEnginesController.php
index 48af8b4b4..a7f1e2804 100644
--- a/controllers/admin/AdminSearchEnginesController.php
+++ b/controllers/admin/AdminSearchEnginesController.php
@@ -31,11 +31,12 @@ class AdminSearchEnginesControllerCore extends AdminController
 	{
 	 	$this->table = 'search_engine';
 	 	$this->className = 'SearchEngine';
-	 	$this->edit = true;
-		$this->delete = true;
 	 	$this->lang = false;
 		$this->requiredDatabase = true;
 
+		$this->addRowAction('edit');
+		$this->addRowAction('delete');
+
 		$this->context = Context::getContext();
 
 		if (!Tools::getValue('realedit'))
diff --git a/controllers/admin/AdminShopUrlController.php b/controllers/admin/AdminShopUrlController.php
index 0a5e76d21..714514f09 100644
--- a/controllers/admin/AdminShopUrlController.php
+++ b/controllers/admin/AdminShopUrlController.php
@@ -32,11 +32,12 @@ class AdminShopUrlControllerCore extends AdminController
 	 	$this->table = 'shop_url';
 		$this->className = 'ShopUrl';
 	 	$this->lang = false;
-	 	$this->edit = true;
-		$this->delete = true;
 		$this->requiredDatabase = true;
 		$this->_listSkipDelete = array(1);
 
+		$this->addRowAction('edit');
+		$this->addRowAction('delete');
+
 		$this->context = Context::getContext();
 
 		if (!Tools::getValue('realedit'))
diff --git a/controllers/admin/AdminStatesController.php b/controllers/admin/AdminStatesController.php
index 33bc79e39..7747d472a 100644
--- a/controllers/admin/AdminStatesController.php
+++ b/controllers/admin/AdminStatesController.php
@@ -32,10 +32,11 @@ class AdminStatesControllerCore extends AdminController
 	 	$this->table = 'state';
 		$this->className = 'State';
 	 	$this->lang = false;
-	 	$this->edit = true;
-	 	$this->delete = true;
 		$this->requiredDatabase = true;
 
+		$this->addRowAction('edit');
+		$this->addRowAction('delete');
+
 		$this->context = Context::getContext();
 
 		if (!Tools::getValue('realedit'))