diff --git a/core/lib/Thelia/Command/GenerateResources.php b/core/lib/Thelia/Command/GenerateResources.php
index 217672797..46924ac99 100644
--- a/core/lib/Thelia/Command/GenerateResources.php
+++ b/core/lib/Thelia/Command/GenerateResources.php
@@ -29,6 +29,7 @@ use Symfony\Component\Console\Output\OutputInterface;
 
 use Thelia\Command\ContainerAwareCommand;
 use Thelia\Model\Admin;
+use Thelia\Model\Map\ResourceI18nTableMap;
 use Thelia\Model\Map\ResourceTableMap;
 
 class GenerateResources extends ContainerAwareCommand
@@ -46,7 +47,7 @@ class GenerateResources extends ContainerAwareCommand
                 'output',
                 null,
                 InputOption::VALUE_OPTIONAL,
-                'Output format amid (string, sql)',
+                'Output format amid (string, sql, sql-i18n)',
                 null
             )
         ;
@@ -55,7 +56,7 @@ class GenerateResources extends ContainerAwareCommand
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
-        $class = new \ReflectionClass('Thelia\Core\Event\AdminResources');
+        $class = new \ReflectionClass('Thelia\Core\Security\Resource\AdminResources');
 
         $constants = $class->getConstants();
 
@@ -69,12 +70,36 @@ class GenerateResources extends ContainerAwareCommand
                 $output->writeln(
                     'INSERT INTO ' . ResourceTableMap::TABLE_NAME . ' (`id`, `code`, `created_at`, `updated_at`) VALUES '
                 );
+                $compteur = 0;
                 foreach($constants as $constant => $value) {
                     if($constant == 'SUPERADMINISTRATOR') {
                         continue;
                     }
+                    $compteur++;
                     $output->writeln(
-                        "(NULL, '$value', NOW(), NOW())" . ($constant === key( array_slice( $constants, -1, 1, TRUE ) ) ? '' : ',')
+                        "($compteur, '$value', NOW(), NOW())" . ($constant === key( array_slice( $constants, -1, 1, true ) ) ? ';' : ',')
+                    );
+                }
+                break;
+            case 'sql-i18n':
+                $output->writeln(
+                    'INSERT INTO ' . ResourceI18nTableMap::TABLE_NAME . ' (`id`, `locale`, `title`) VALUES '
+                );
+                $compteur = 0;
+                foreach($constants as $constant => $value) {
+                    if($constant == 'SUPERADMINISTRATOR') {
+                        continue;
+                    }
+
+                    $compteur++;
+
+                    $title = ucwords( str_replace('.', ' / ', str_replace('admin.', '', $value) ) );
+
+                    $output->writeln(
+                        "($compteur, 'en_US', '$title'),"
+                    );
+                    $output->writeln(
+                        "($compteur, 'fr_FR', '$title')" . ($constant === key( array_slice( $constants, -1, 1, true ) ) ? ';' : ',')
                     );
                 }
                 break;
diff --git a/core/lib/Thelia/Config/Resources/config.xml b/core/lib/Thelia/Config/Resources/config.xml
index 493f9fbf8..9e7d86c3d 100755
--- a/core/lib/Thelia/Config/Resources/config.xml
+++ b/core/lib/Thelia/Config/Resources/config.xml
@@ -35,6 +35,7 @@
         <loop class="Thelia\Core\Template\Loop\Product" name="product"/>
         <loop class="Thelia\Core\Template\Loop\ProductSaleElements" name="product_sale_elements"/>
         <loop class="Thelia\Core\Template\Loop\Profile" name="profile"/>
+        <loop class="Thelia\Core\Template\Loop\Resource" name="resource"/>
         <loop class="Thelia\Core\Template\Loop\Feed" name="feed"/>
         <loop class="Thelia\Core\Template\Loop\Title" name="title"/>
         <loop class="Thelia\Core\Template\Loop\Lang" name="lang"/>
diff --git a/core/lib/Thelia/Controller/Admin/BaseAdminController.php b/core/lib/Thelia/Controller/Admin/BaseAdminController.php
index 186727ed5..fdbb6c1c4 100755
--- a/core/lib/Thelia/Controller/Admin/BaseAdminController.php
+++ b/core/lib/Thelia/Controller/Admin/BaseAdminController.php
@@ -128,7 +128,7 @@ class BaseAdminController extends BaseController
          }
 
          // Log the problem
-         $this->adminLogAppend("User is not granted for permissions %s", implode(", ", $permArr));
+         $this->adminLogAppend("User is not granted for resources %s with accesses %s", implode(", ", $resources), implode(", ", $accesses));
 
          // Generate the proper response
          $response = new Response();
diff --git a/core/lib/Thelia/Core/Security/AccessManager.php b/core/lib/Thelia/Core/Security/AccessManager.php
index cdf7105a8..229c07a00 100644
--- a/core/lib/Thelia/Core/Security/AccessManager.php
+++ b/core/lib/Thelia/Core/Security/AccessManager.php
@@ -63,8 +63,9 @@ class AccessManager
         $this->accessValue = $accessValue;
 
         foreach($this->accessPows as $type => $value) {
-            if($accessValue >= $value) {
-                $accessValue -= $value;
+            $pow = pow(2, $value);
+            if($accessValue >= $pow) {
+                $accessValue -= $pow;
                 $this->accessGranted[$type] = true;
             } else {
                 $this->accessGranted[$type] = false;
diff --git a/core/lib/Thelia/Core/Template/Loop/Admin.php b/core/lib/Thelia/Core/Template/Loop/Admin.php
index fe4b280ad..378bcaf31 100755
--- a/core/lib/Thelia/Core/Template/Loop/Admin.php
+++ b/core/lib/Thelia/Core/Template/Loop/Admin.php
@@ -25,6 +25,7 @@ namespace Thelia\Core\Template\Loop;
 
 use Propel\Runtime\ActiveQuery\Criteria;
 use Thelia\Core\Template\Element\BaseI18nLoop;
+use Thelia\Core\Template\Element\BaseLoop;
 use Thelia\Core\Template\Element\LoopResult;
 use Thelia\Core\Template\Element\LoopResultRow;
 
@@ -44,7 +45,7 @@ use Thelia\Type\BooleanOrBothType;
  * @package Thelia\Core\Template\Loop
  * @author Etienne Roudeix <eroudeix@openstudio.fr>
  */
-class Admin extends BaseI18nLoop
+class Admin extends BaseLoop
 {
     public $timestampable = true;
 
@@ -83,17 +84,17 @@ class Admin extends BaseI18nLoop
         $search->orderByFirstname(Criteria::ASC);
 
         /* perform search */
-        $features = $this->search($search, $pagination);
+        $admins = $this->search($search, $pagination);
 
-        $loopResult = new LoopResult($features);
+        $loopResult = new LoopResult($admins);
 
-        foreach ($features as $feature) {
-            $loopResultRow = new LoopResultRow($loopResult, $feature, $this->versionable, $this->timestampable, $this->countable);
-            $loopResultRow->set("ID", $feature->getId())
-                ->set("PROFILE",$feature->getProfileId())
-                ->set("FIRSTNAME",$feature->getFirstname())
-                ->set("LASTNAME",$feature->getLastname())
-                ->set("LOGIN",$feature->getLogin())
+        foreach ($admins as $admin) {
+            $loopResultRow = new LoopResultRow($loopResult, $admin, $this->versionable, $this->timestampable, $this->countable);
+            $loopResultRow->set("ID", $admin->getId())
+                ->set("PROFILE",$admin->getProfileId())
+                ->set("FIRSTNAME",$admin->getFirstname())
+                ->set("LASTNAME",$admin->getLastname())
+                ->set("LOGIN",$admin->getLogin())
             ;
 
             $loopResult->addRow($loopResultRow);
diff --git a/core/lib/Thelia/Core/Template/Loop/Auth.php b/core/lib/Thelia/Core/Template/Loop/Auth.php
index f5691cbd6..cdb668978 100755
--- a/core/lib/Thelia/Core/Template/Loop/Auth.php
+++ b/core/lib/Thelia/Core/Template/Loop/Auth.php
@@ -23,6 +23,7 @@
 
 namespace Thelia\Core\Template\Loop;
 
+use Thelia\Core\Security\AccessManager;
 use Thelia\Core\Template\Element\BaseLoop;
 use Thelia\Core\Template\Element\LoopResult;
 use Thelia\Core\Template\Element\LoopResultRow;
@@ -45,7 +46,7 @@ class Auth extends BaseLoop
     {
         return new ArgumentCollection(
             new Argument(
-                'roles',
+                'role',
                 new TypeCollection(
                     new AlphaNumStringListType()
                 ),
@@ -61,7 +62,7 @@ class Auth extends BaseLoop
             new Argument(
                 'access',
                 new TypeCollection(
-                    new EnumListType(array("view", "create", "update", "delete"))
+                    new EnumListType(array(AccessManager::VIEW, AccessManager::CREATE, AccessManager::UPDATE, AccessManager::DELETE))
                 )
             ),
             Argument::createAnyTypeArgument('context', 'front', false)
@@ -75,7 +76,7 @@ class Auth extends BaseLoop
      */
     public function exec(&$pagination)
     {
-        $roles = $this->getRoles();
+        $roles = $this->getRole();
         $resource = $this->getResource();
         $access = $this->getAccess();
 
diff --git a/core/lib/Thelia/Core/Template/Loop/Profile.php b/core/lib/Thelia/Core/Template/Loop/Profile.php
index a7a2e170e..4ac43d25a 100755
--- a/core/lib/Thelia/Core/Template/Loop/Profile.php
+++ b/core/lib/Thelia/Core/Template/Loop/Profile.php
@@ -79,20 +79,20 @@ class Profile extends BaseI18nLoop
         $search->orderById(Criteria::ASC);
 
         /* perform search */
-        $features = $this->search($search, $pagination);
+        $profiles = $this->search($search, $pagination);
 
-        $loopResult = new LoopResult($features);
+        $loopResult = new LoopResult($profiles);
 
-        foreach ($features as $feature) {
-            $loopResultRow = new LoopResultRow($loopResult, $feature, $this->versionable, $this->timestampable, $this->countable);
-            $loopResultRow->set("ID", $feature->getId())
-                ->set("IS_TRANSLATED",$feature->getVirtualColumn('IS_TRANSLATED'))
+        foreach ($profiles as $profile) {
+            $loopResultRow = new LoopResultRow($loopResult, $profile, $this->versionable, $this->timestampable, $this->countable);
+            $loopResultRow->set("ID", $profile->getId())
+                ->set("IS_TRANSLATED",$profile->getVirtualColumn('IS_TRANSLATED'))
                 ->set("LOCALE",$locale)
-                ->set("CODE",$feature->getCode())
-                ->set("TITLE",$feature->getVirtualColumn('i18n_TITLE'))
-                ->set("CHAPO", $feature->getVirtualColumn('i18n_CHAPO'))
-                ->set("DESCRIPTION", $feature->getVirtualColumn('i18n_DESCRIPTION'))
-                ->set("POSTSCRIPTUM", $feature->getVirtualColumn('i18n_POSTSCRIPTUM'))
+                ->set("CODE",$profile->getCode())
+                ->set("TITLE",$profile->getVirtualColumn('i18n_TITLE'))
+                ->set("CHAPO", $profile->getVirtualColumn('i18n_CHAPO'))
+                ->set("DESCRIPTION", $profile->getVirtualColumn('i18n_DESCRIPTION'))
+                ->set("POSTSCRIPTUM", $profile->getVirtualColumn('i18n_POSTSCRIPTUM'))
             ;
 
             $loopResult->addRow($loopResultRow);
diff --git a/core/lib/Thelia/Core/Template/Loop/Resource.php b/core/lib/Thelia/Core/Template/Loop/Resource.php
new file mode 100755
index 000000000..949cb5e00
--- /dev/null
+++ b/core/lib/Thelia/Core/Template/Loop/Resource.php
@@ -0,0 +1,115 @@
+<?php
+/*************************************************************************************/
+/*                                                                                   */
+/*      Thelia	                                                                     */
+/*                                                                                   */
+/*      Copyright (c) OpenStudio                                                     */
+/*      email : info@thelia.net                                                      */
+/*      web : http://www.thelia.net                                                  */
+/*                                                                                   */
+/*      This program is free software; you can redistribute it and/or modify         */
+/*      it under the terms of the GNU General Public License as published by         */
+/*      the Free Software Foundation; either version 3 of the License                */
+/*                                                                                   */
+/*      This program is distributed in the hope that it will be useful,              */
+/*      but WITHOUT ANY WARRANTY; without even the implied warranty of               */
+/*      MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the                */
+/*      GNU General Public License for more details.                                 */
+/*                                                                                   */
+/*      You should have received a copy of the GNU General Public License            */
+/*	    along with this program. If not, see <http://www.gnu.org/licenses/>.         */
+/*                                                                                   */
+/*************************************************************************************/
+
+namespace Thelia\Core\Template\Loop;
+
+use Propel\Runtime\ActiveQuery\Criteria;
+use Thelia\Core\Security\AccessManager;
+use Thelia\Core\Template\Element\BaseI18nLoop;
+use Thelia\Core\Template\Element\LoopResult;
+use Thelia\Core\Template\Element\LoopResultRow;
+
+use Thelia\Core\Template\Loop\Argument\ArgumentCollection;
+use Thelia\Core\Template\Loop\Argument\Argument;
+
+use Thelia\Model\ResourceQuery;
+use Thelia\Type;
+use Thelia\Type\BooleanOrBothType;
+
+/**
+ *
+ * Resource loop
+ *
+ *
+ * Class Resource
+ * @package Thelia\Core\Template\Loop
+ * @author Etienne Roudeix <eroudeix@openstudio.fr>
+ */
+class Resource extends BaseI18nLoop
+{
+    public $timestampable = true;
+
+    /**
+     * @return ArgumentCollection
+     */
+    protected function getArgDefinitions()
+    {
+        return new ArgumentCollection(
+            Argument::createIntTypeArgument('profile')
+        );
+    }
+
+    /**
+     * @param $pagination
+     *
+     * @return \Thelia\Core\Template\Element\LoopResult
+     */
+    public function exec(&$pagination)
+    {
+        $search = ResourceQuery::create();
+
+        /* manage translations */
+        $locale = $this->configureI18nProcessing($search);
+
+        $profile = $this->getProfile();
+
+        if (null !== $profile) {
+            $search->leftJoinProfileResource('profile_resource')
+                ->withColumn('profile_resource.access', 'access');
+            //$search->filterById($id, Criteria::IN);
+        }
+
+        $search->orderById(Criteria::ASC);
+
+        /* perform search */
+        $resources = $this->search($search, $pagination);
+
+        $loopResult = new LoopResult($resources);
+
+        foreach ($resources as $resource) {
+            $loopResultRow = new LoopResultRow($loopResult, $resource, $this->versionable, $this->timestampable, $this->countable);
+            $loopResultRow->set("ID", $resource->getId())
+                ->set("IS_TRANSLATED",$resource->getVirtualColumn('IS_TRANSLATED'))
+                ->set("LOCALE",$locale)
+                ->set("CODE",$resource->getCode())
+                ->set("TITLE",$resource->getVirtualColumn('i18n_TITLE'))
+                ->set("CHAPO", $resource->getVirtualColumn('i18n_CHAPO'))
+                ->set("DESCRIPTION", $resource->getVirtualColumn('i18n_DESCRIPTION'))
+                ->set("POSTSCRIPTUM", $resource->getVirtualColumn('i18n_POSTSCRIPTUM'))
+            ;
+
+            if (null !== $profile) {
+                $accessValue = $resource->getVirtualColumn('access');
+                $manager = new AccessManager($accessValue);
+                $loopResultRow->set("VIEWABLE", $manager->can(AccessManager::VIEW))
+                    ->set("CREATABLE", $manager->can(AccessManager::CREATE))
+                    ->set("UPDATABLE", $manager->can(AccessManager::UPDATE))
+                    ->set("DELETABLE", $manager->can(AccessManager::DELETE));
+            }
+
+            $loopResult->addRow($loopResultRow);
+        }
+
+        return $loopResult;
+    }
+}
diff --git a/install/insert.sql b/install/insert.sql
index 80ab5a844..b4b7a764f 100755
--- a/install/insert.sql
+++ b/install/insert.sql
@@ -1193,7 +1193,6 @@ INSERT INTO `order_status_i18n` (`id`, `locale`, `title`, `description`, `chapo`
 (5, 'en_US', 'Canceled', '', '', ''),
 (5, 'fr_FR', 'Annulée', '', '', '');
 
-
 /**
 generated with command : php Thelia thelia:generate-resources --output sql
  */
@@ -1220,4 +1219,55 @@ INSERT INTO resource (`id`, `code`, `created_at`, `updated_at`) VALUES
 (NULL, 'admin.configuration.profile', NOW(), NOW()),
 (NULL, 'admin.configuration.shipping-zone', NOW(), NOW()),
 (NULL, 'admin.configuration.tax', NOW(), NOW()),
-(NULL, 'admin.configuration.template', NOW(), NOW())
+(NULL, 'admin.configuration.template', NOW(), NOW());
+
+/**
+generated with command : php Thelia thelia:generate-resources --output sql-i18n
+ */
+INSERT INTO resource_i18n (`id`, `locale`, `title`) VALUES
+(1, 'en_US', 'Address'),
+(1, 'fr_FR', 'Address'),
+(2, 'en_US', 'Configuration / Admin'),
+(2, 'fr_FR', 'Configuration / Admin'),
+(3, 'en_US', 'Configuration / Area'),
+(3, 'fr_FR', 'Configuration / Area'),
+(4, 'en_US', 'Configuration / Attribute'),
+(4, 'fr_FR', 'Configuration / Attribute'),
+(5, 'en_US', 'Category'),
+(5, 'fr_FR', 'Category'),
+(6, 'en_US', 'Configuration'),
+(6, 'fr_FR', 'Configuration'),
+(7, 'en_US', 'Content'),
+(7, 'fr_FR', 'Content'),
+(8, 'en_US', 'Configuration / Country'),
+(8, 'fr_FR', 'Configuration / Country'),
+(9, 'en_US', 'Coupon'),
+(9, 'fr_FR', 'Coupon'),
+(10, 'en_US', 'Configuration / Currency'),
+(10, 'fr_FR', 'Configuration / Currency'),
+(11, 'en_US', 'Customer'),
+(11, 'fr_FR', 'Customer'),
+(12, 'en_US', 'Configuration / Feature'),
+(12, 'fr_FR', 'Configuration / Feature'),
+(13, 'en_US', 'Folder'),
+(13, 'fr_FR', 'Folder'),
+(14, 'en_US', 'Configuration / Language'),
+(14, 'fr_FR', 'Configuration / Language'),
+(15, 'en_US', 'Configuration / Mailing-system'),
+(15, 'fr_FR', 'Configuration / Mailing-system'),
+(16, 'en_US', 'Configuration / Message'),
+(16, 'fr_FR', 'Configuration / Message'),
+(17, 'en_US', 'Configuration / Module'),
+(17, 'fr_FR', 'Configuration / Module'),
+(18, 'en_US', 'Order'),
+(18, 'fr_FR', 'Order'),
+(19, 'en_US', 'Product'),
+(19, 'fr_FR', 'Product'),
+(20, 'en_US', 'Configuration / Profile'),
+(20, 'fr_FR', 'Configuration / Profile'),
+(21, 'en_US', 'Configuration / Shipping-zone'),
+(21, 'fr_FR', 'Configuration / Shipping-zone'),
+(22, 'en_US', 'Configuration / Tax'),
+(22, 'fr_FR', 'Configuration / Tax'),
+(23, 'en_US', 'Configuration / Template'),
+(23, 'fr_FR', 'Configuration / Template');
diff --git a/templates/admin/default/admin-layout.tpl b/templates/admin/default/admin-layout.tpl
index 743264d7a..3d671ecb2 100644
--- a/templates/admin/default/admin-layout.tpl
+++ b/templates/admin/default/admin-layout.tpl
@@ -44,7 +44,7 @@
 <body>
 	{* display top bar only if admin is connected *}
 
-	{loop name="top-bar-auth" type="auth" roles="ADMIN"}
+	{loop name="top-bar-auth" type="auth" role="ADMIN"}
 
 	    {* -- Brand bar section ------------------------------------------------- *}
 
@@ -107,13 +107,13 @@
                                 <a href="{url path='/admin/home'}">{intl l="Home"}</a>
                             </li>
 
-                            {loop name="menu-auth-customer" type="auth" roles="ADMIN" permissions="admin.customers.view"}
+                            {loop name="menu-auth-customer" type="auth" role="ADMIN" resource="admin.customer" access="VIEW"}
                             <li class="{if $admin_current_location == 'customer'}active{/if}" id="customers_menu">
                                 <a href="{url path='/admin/customers'}">{intl l="Customers"}</a>
                             </li>
                             {/loop}
 
-                            {loop name="menu-auth-order" type="auth" roles="ADMIN" permissions="admin.orders.view"}
+                            {loop name="menu-auth-order" type="auth" role="ADMIN" resource="admin.order" access="VIEW"}
                                 <li class="dropdown {if $admin_current_location == 'order'}active{/if}" id="orders_menu">
 
                                     <a href="#" class="dropdown-toggle" data-toggle="dropdown">{intl l="Orders"} <span class="caret"></span></a>
@@ -140,31 +140,31 @@
                                 </li>
                             {/loop}
 
-                            {loop name="menu-auth-catalog" type="auth" roles="ADMIN" permissions="admin.catalog.view"}
+                            {loop name="menu-auth-catalog" type="auth" role="ADMIN" resource="admin.category" access="VIEW"}
                             <li class="{if $admin_current_location == 'catalog'}active{/if}" id="catalog_menu">
                                 <a href="{url path='/admin/catalog'}">{intl l="Catalog"}</a>
                             </li>
                             {/loop}
 
-                            {loop name="menu-auth-content" type="auth" roles="ADMIN" permissions="admin.folders.view"}
+                            {loop name="menu-auth-content" type="auth" role="ADMIN" resource="admin.folder"  access="VIEW"}
                             <li class="{if $admin_current_location == 'folder'}active{/if}" id="folders_menu">
                                 <a href="{url path='/admin/folders'}">{intl l="Folders"}</a>
                             </li>
                             {/loop}
 
-                            {loop name="menu-auth-coupon" type="auth" roles="ADMIN" permissions="admin.coupon.view"}
+                            {loop name="menu-auth-coupon" type="auth" role="ADMIN" resource="admin.coupon"  access="VIEW"}
                             <li class="{if $admin_current_location == 'coupon'}active{/if}" id="coupon_menu">
                                 <a href="{url path='/admin/coupon'}">{intl l="Coupons"}</a>
                             </li>
                             {/loop}
 
-                            {loop name="menu-auth-config" type="auth" roles="ADMIN" permissions="admin.config.view"}
+                            {loop name="menu-auth-config" type="auth" role="ADMIN" resource="admin.config"  access="VIEW"}
                             <li class="{if $admin_current_location == 'configuration'}active{/if}" id="config_menu">
                                 <a href="{url path='/admin/configuration'}">{intl l="Configuration"}</a>
                             </li>
                             {/loop}
 
-                            {loop name="menu-auth-modules" type="auth" roles="ADMIN" permissions="admin.modules.view"}
+                            {loop name="menu-auth-modules" type="auth" role="ADMIN" resource="admin.module"  access="VIEW"}
                             <li class="{if $admin_current_location == 'modules'}active{/if}" id="modules_menu">
                                 <a href="{url path='/admin/modules'}">{intl l="Modules"}</a>
                             </li>
@@ -174,7 +174,7 @@
                             {/loop}
                         </ul>
 
-                        {loop name="top-bar-search" type="auth" roles="ADMIN" permissions="admin.search"}
+                        {loop name="top-bar-search" type="auth" role="ADMIN" resource="admin.search"  access="VIEW"}
                         <form class="navbar-form pull-right hidden-xs" action="{url path='/admin/search'}">
                             <div class="form-group">
                                 <input type="text" class="form-control" id="search_term" name="search_term" placeholder="{intl l='Search'}">
diff --git a/templates/admin/default/ajax/product-related-tab.html b/templates/admin/default/ajax/product-related-tab.html
index 24c8b71a1..b0aa1077b 100644
--- a/templates/admin/default/ajax/product-related-tab.html
+++ b/templates/admin/default/ajax/product-related-tab.html
@@ -104,7 +104,7 @@
 
 		                        <td class="actions">
 		                            <div class="btn-group">
-		                                {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.product.content.delete"}
+		                                {loop type="auth" name="can_create" role="ADMIN" resources="admin.product" access="UPDATE"}
 		                                   <a class="btn btn-default btn-xs delete-content" title="{intl l='Delete this content'}" href="#delete_content_dialog" data-id="{$ID}" data-toggle="modal">
 		                                    <span class="glyphicon glyphicon-trash"></span>
 		                                   </a>
@@ -225,7 +225,7 @@
 
 		                        <td class="actions">
 		                            <div class="btn-group">
-		                                {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.product.accessory.delete"}
+		                                {loop type="auth" name="can_create" role="ADMIN" resources="admin.product" access="UPDATE"}
 		                                   <a class="btn btn-default btn-xs delete-accessory" title="{intl l='Delete this accessory'}" href="#delete_accessory_dialog" data-id="{$ID}" data-toggle="modal">
 		                                    <span class="glyphicon glyphicon-trash"></span>
 		                                   </a>
@@ -331,7 +331,7 @@
 
 	                            <td class="actions">
 	                                <div class="btn-group">
-	                                    {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.product.category.delete"}
+	                                    {loop type="auth" name="can_delete" role="ADMIN" resources="admin.product" access="UPDATE"}
 	                                       <a class="btn btn-default btn-xs delete-category" title="{intl l='Remove the product from this category'}" href="#delete_category_dialog" data-id="{$ID}" data-toggle="modal">
 	                                        <span class="glyphicon glyphicon-trash"></span>
 	                                       </a>
diff --git a/templates/admin/default/ajax/template-attribute-list.html b/templates/admin/default/ajax/template-attribute-list.html
index 27d4f9831..619d13d53 100644
--- a/templates/admin/default/ajax/template-attribute-list.html
+++ b/templates/admin/default/ajax/template-attribute-list.html
@@ -64,7 +64,7 @@
 
             <td class="actions">
                 <div class="btn-group">
-                    {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.template.attribute.delete"}
+                    {loop type="auth" name="can_create" role="ADMIN" resource="admin.configuration.template"  access="UPDATE"}
                        <a class="btn btn-default btn-xs delete-attribute" title="{intl l='Delete this attribute'}" href="#delete_attribute_dialog" data-id="{$ID}" data-toggle="modal">
                         <span class="glyphicon glyphicon-trash"></span>
                        </a>
diff --git a/templates/admin/default/ajax/template-feature-list.html b/templates/admin/default/ajax/template-feature-list.html
index 26b09baea..24b50918e 100644
--- a/templates/admin/default/ajax/template-feature-list.html
+++ b/templates/admin/default/ajax/template-feature-list.html
@@ -66,7 +66,7 @@
 
             <td class="actions">
                 <div class="btn-group">
-                    {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.template.feature.delete"}
+                    {loop type="auth" name="can_create" role="ADMIN" resource="admin.configuration.template"  access="UPDATE"}
                        <a class="btn btn-default btn-xs delete-feature" title="{intl l='Delete this feature'}" href="#delete_feature_dialog" data-id="{$ID}" data-toggle="modal">
                         <span class="glyphicon glyphicon-trash"></span>
                        </a>
diff --git a/templates/admin/default/attribute-edit.html b/templates/admin/default/attribute-edit.html
index 1b3417ef6..e9a09c719 100644
--- a/templates/admin/default/attribute-edit.html
+++ b/templates/admin/default/attribute-edit.html
@@ -66,7 +66,7 @@
 
 		     						         {intl l='Attribute values'}
 
-		                                     {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.attribute-av.create"}
+		                                     {loop type="auth" name="can_create" role="ADMIN" resource="admin.configuration.attribute" access="UPDATE"}
 		                                     <span class="pull-right">
 		                                         <a data-toggle="modal" href="#creation_dialog" title="Add a new attribute value" class="btn btn-default btn-primary">
 		                                             <span class="glyphicon glyphicon-plus-sign"></span>
@@ -148,7 +148,7 @@
 
     				                                    <td class="actions">
     				                                        <div class="btn-group">
-    				                                            {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.attribute-av.delete"}
+    				                                            {loop type="auth" name="can_create" role="ADMIN" resource="admin.configuration.attribute" access="UPDATE"}
     				                                               <a class="btn btn-default btn-xs value-delete" title="{intl l='Delete this value'}" href="#delete_dialog" data-id="{$ID}" data-toggle="modal">
     				                                                <span class="glyphicon glyphicon-trash"></span>
     				                                               </a>
diff --git a/templates/admin/default/attributes.html b/templates/admin/default/attributes.html
index 28a927920..6a4eb7f46 100644
--- a/templates/admin/default/attributes.html
+++ b/templates/admin/default/attributes.html
@@ -27,7 +27,7 @@
     	                        <caption>
     	                           {intl l='Thelia product attributes'}
 
-                                    {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.attributes.create"}
+                                    {loop type="auth" name="can_create" role="ADMIN" resource="admin.configuration.attribute" access="CREATE"}
                                     <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new product attribute'}" href="#creation_dialog" data-toggle="modal">
                                         <span class="glyphicon glyphicon-plus-sign"></span>
                                     </a>
@@ -77,7 +77,7 @@
                                         <td>{$ID}</td>
 
                                         <td>
-                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.attributes.change"}
+                                            {loop type="auth" name="can_change" role="ADMIN" resource="admin.configuration.attribute" access="UPDATE"}
                                                 <a title="{intl l='Change this attribute'}" href="{url path='/admin/configuration/attributes/update' attribute_id=$ID}">{$TITLE}</a>
                                             {/loop}
                                             {elseloop rel="can_change"}
@@ -100,7 +100,7 @@
                                         {module_include location='attributes_table_row'}
 
                                         <td class="actions">
-                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.attributes.change"}
+                                            {loop type="auth" name="can_change" role="ADMIN" resource="admin.configuration.attribute" access="UPDATE"}
                                             <div class="btn-group">
                                                 <a class="btn btn-default btn-xs attribute-remove-from-all" title="{intl l='Remove this attribute from all product templates'}" href="#remove_from_all_dialog" data-id="{$ID}" data-toggle="modal">
                                                     <span class="glyphicon glyphicon-minus"></span>
@@ -112,11 +112,11 @@
                                             {/loop}
 
                                             <div class="btn-group">
-    	                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.attributes.change"}
+    	                                        {loop type="auth" name="can_change" role="ADMIN" resource="admin.configuration.attribute" access="UPDATE"}
     	                                            <a class="btn btn-default btn-xs attribute-change" title="{intl l='Change this product attribute'}" href="{url path='/admin/configuration/attributes/update' attribute_id=$ID}"><span class="glyphicon glyphicon-edit"></span></a>
     	                                        {/loop}
 
-    	                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.attributes.delete"}
+    	                                        {loop type="auth" name="can_change" role="ADMIN" resource="admin.configuration.attribute" access="DELETE"}
     	                                            <a class="btn btn-default btn-xs attribute-delete" title="{intl l='Delete this product attribute'}" href="#delete_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
     	                                        {/loop}
                                             </div>
diff --git a/templates/admin/default/categories.html b/templates/admin/default/categories.html
index 89c0e6923..549d52d23 100755
--- a/templates/admin/default/categories.html
+++ b/templates/admin/default/categories.html
@@ -31,7 +31,7 @@
 
                                  {module_include location='category_list_caption'}
 
-                                 {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.categories.create"}
+                                 {loop type="auth" name="can_create" role="ADMIN" resource="admin.category" access="CREATE"}
                                  <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new category'}" href="#category_creation_dialog" data-toggle="modal">
                                      <span class="glyphicon glyphicon-plus-sign"></span>
                                  </a>
@@ -113,7 +113,7 @@
                                      {module_include location='category_list_row'}
 
                                      <td>
-                                         {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.categories.edit"}
+                                         {loop type="auth" name="can_change" role="ADMIN" resource="admin.category" access="UPDATE"}
                                              <div class="make-switch switch-small categoryVisibleToggle" data-id="{$ID}"  data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
                                                  <input type="checkbox" class="categoryVisibleToggle" {if $VISIBLE == 1}checked="checked"{/if}>
                                              </div>
@@ -142,11 +142,11 @@
                                          <div class="btn-group">
                                              <a class="btn btn-default btn-xs" title="{intl l='Browse this category'}" href="{url path='admin/categories' category_id=$ID}"><i class="glyphicon glyphicon-folder-open"></i></a>
 
-                                             {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.categories.edit"}
+                                             {loop type="auth" name="can_change" role="ADMIN" resource="admin.category" access="UPDATE"}
                                                 <a class="btn btn-default btn-xs" title="{intl l='Edit this category'}" href="{url path='/admin/categories/update' category_id=$ID}"><i class="glyphicon glyphicon-edit"></i></a>
                                              {/loop}
 
-                                             {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.categories.delete"}
+                                             {loop type="auth" name="can_delete" role="ADMIN" resource="admin.category" access="DELETE"}
                                                 <a class="btn btn-default btn-xs category-delete" title="{intl l='Delete this category and all its contents'}"  href="#category_delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
                                              {/loop}
                                          </div>
@@ -161,7 +161,7 @@
                                  <tr>
                                      <td class="message">
                                          <div class="alert alert-info">
-                                         {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.categories.create"}
+                                         {loop type="auth" name="can_create" role="ADMIN" resource="admin.category" access="CREATE"}
                                              {intl l="This category has no sub-categories. To create a new one, click the + button above."}
                                          {/loop}
 
@@ -281,7 +281,7 @@
                              {module_include location='product_list_row'}
 
                              <td>
-                                    {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.products.edit"}
+                                    {loop type="auth" name="can_change" role="ADMIN" resource="admin.product" access="UPDATE"}
                                         <div class="make-switch switch-small productVisibleToggle" data-id="{$ID}"  data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
                                             <input type="checkbox" class="productVisibleToggle" {if $VISIBLE == 1}checked="checked"{/if}>
                                         </div>
@@ -308,11 +308,11 @@
 
                              <td class="actions">
                                  <div class="btn-group">
-                                 {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.product.edit"}
+                                 {loop type="auth" name="can_change" role="ADMIN" resource="admin.product" access="UPDATE"}
                                     <a class="btn btn-default btn-xs" title="{intl l='Edit this product'}" href="{url path='/admin/products/update' product_id=$ID}"><i class="glyphicon glyphicon-edit"></i></a>
                                 {/loop}
 
-                                 {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.product.delete"}
+                                 {loop type="auth" name="can_delete" role="ADMIN" resource="admin.product" access="DELETE"}
                                        <a class="btn btn-default btn-xs product-delete" title="{intl l='Delete this product'}"  href="#product_delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
                                  {/loop}
                                  </div>
diff --git a/templates/admin/default/category-edit.html b/templates/admin/default/category-edit.html
index ceefa53bb..340e7cbbd 100755
--- a/templates/admin/default/category-edit.html
+++ b/templates/admin/default/category-edit.html
@@ -231,7 +231,7 @@
 
 										            <td class="actions">
 										                <div class="btn-group">
-										                    {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.category.content.delete"}
+										                    {loop type="auth" name="can_create" role="ADMIN" resource="admin.configuration.category" access="UPDATE"}
 										                       <a class="btn btn-default btn-xs delete-content" title="{intl l='Delete this content'}" href="#delete_content_dialog" data-id="{$ID}" data-toggle="modal">
 										                        <span class="glyphicon glyphicon-trash"></span>
 										                       </a>
diff --git a/templates/admin/default/configuration.html b/templates/admin/default/configuration.html
index 16c09bac2..14f195270 100644
--- a/templates/admin/default/configuration.html
+++ b/templates/admin/default/configuration.html
@@ -24,42 +24,42 @@
 
                                 {module_include location='catalog_configuration_top'}
 
-                                {loop type="auth" name="pcc1" roles="ADMIN" permissions="admin.configuration.templates"}
+                                {loop type="auth" name="pcc1" role="ADMIN" resource="admin.configuration.template" access="VIEW"}
                                     <tr>
                                         <td><a href="{url path='/admin/configuration/templates'}">{intl l='Product templates'}</a></td>
                                         <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/templates'}"><i class="glyphicon glyphicon-edit"></i></a></td>
                                     </tr>
                                 {/loop}
 
-                                {loop type="auth" name="pcc2" roles="ADMIN" permissions="admin.configuration.attributes"}
+                                {loop type="auth" name="pcc2" role="ADMIN" resource="admin.configuration.attribute" access="VIEW"}
                                     <tr>
                                         <td><a href="{url path='/admin/configuration/attributes'}">{intl l='Product attributes'}</a></td>
                                         <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/attributes'}"><i class="glyphicon glyphicon-edit"></i></a></td>
                                     </tr>
                                 {/loop}
 
-                                {loop type="auth" name="pcc3" roles="ADMIN" permissions="admin.configuration.features"}
+                                {loop type="auth" name="pcc3" role="ADMIN" resource="admin.configuration.feature" access="VIEW"}
                                     <tr>
                                         <td><a href="{url path='/admin/configuration/features'}">{intl l='Product features'}</a></td>
                                         <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/features'}"><i class="glyphicon glyphicon-edit"></i></a></td>
                                     </tr>
                                 {/loop}
 
-                                {loop type="auth" name="pcc4" roles="ADMIN" permissions="admin.configuration.messages"}
+                                {loop type="auth" name="pcc4" role="ADMIN" resource="admin.configuration.message" access="VIEW"}
                                     <tr>
                                         <td><a href="{url path='/admin/configuration/messages'}">{intl l='Mailing templates'}</a></td>
                                         <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/messages'}"><i class="glyphicon glyphicon-edit"></i></a></td>
                                     </tr>
                                 {/loop}
 
-                                {loop type="auth" name="pcc5" roles="ADMIN" permissions="admin.configuration.currencies"}
+                                {loop type="auth" name="pcc5" role="ADMIN" resource="admin.configuration.currency" access="VIEW"}
                                     <tr>
                                         <td><a href="{url path='/admin/configuration/currencies'}">{intl l='Currencies'}</a></td>
                                         <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/currencies'}"><i class="glyphicon glyphicon-edit"></i></a></td>
                                     </tr>
                                 {/loop}
 
-                                {loop type="auth" name="pcc6" roles="ADMIN" permissions="admin.configuration.taxe-rules"}
+                                {loop type="auth" name="pcc6" role="ADMIN" resource="admin.configuration.tax-rule" access="VIEW"}
                                     <tr>
                                         <td><a href="{url path='/admin/configuration/taxes_rules'}">{intl l='Taxes rules'}</a></td>
                                         <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/taxes_rules'}"><i class="glyphicon glyphicon-edit"></i></a></td>
@@ -80,21 +80,21 @@
 
                                 {module_include location='shipping_configuration_top'}
 
-                                {loop type="auth" name="pcc1" roles="ADMIN" permissions="admin.configuration.contries"}
+                                {loop type="auth" name="pcc1" role="ADMIN" resource="admin.configuration.contry" access="VIEW"}
                                     <tr>
                                         <td><a href="{url path='/admin/configuration/countries'}">{intl l='Countries'}</a></td>
                                         <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/countries'}"><i class="glyphicon glyphicon-edit"></i></a></td>
                                     </tr>
                                 {/loop}
 
-                                {loop type="auth" name="pcc2" roles="ADMIN" permissions="admin.configuration.shipping_zones"}
+                                {loop type="auth" name="pcc2" role="ADMIN" resource="admin.configuration.shipping-zone" access="VIEW"}
                                     <tr>
                                         <td><a href="{url path='/admin/configuration/shipping_zones'}">{intl l='Shipping zones'}</a></td>
                                         <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/shipping_zones'}"><i class="glyphicon glyphicon-edit"></i></a></td>
                                     </tr>
                                 {/loop}
 
-                                {loop type="auth" name="pcc3" roles="ADMIN" permissions="admin.configuration.shipping_configuration"}
+                                {loop type="auth" name="pcc3" role="ADMIN" resource="admin.configuration.shipping-configuration" access="VIEW"}
                                     <tr>
                                         <td><a href="{url path='/admin/configuration/shipping_configuration'}">{intl l='Shipping configuration'}</a></td>
                                         <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/shipping_configuration'}"><i class="glyphicon glyphicon-edit"></i></a></td>
@@ -116,56 +116,56 @@
 
                                 {module_include location='system_configuration_top'}
 
-                                {loop type="auth" name="pcc1" roles="ADMIN" permissions="admin.configuration.modules"}
+                                {loop type="auth" name="pcc1" role="ADMIN" resource="admin.configuration.module" access="VIEW"}
                                     <tr>
                                         <td><a href="{url path='/admin/configuration/modules'}">{intl l='Modules activation'}</a></td>
                                         <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/modules'}"><i class="glyphicon glyphicon-edit"></i></a></td>
                                     </tr>
                                 {/loop}
 
-                                {loop type="auth" name="pcc2" roles="ADMIN" permissions="admin.configuration.variables"}
+                                {loop type="auth" name="pcc2" role="ADMIN" resource="admin.configuration.variable" access="VIEW"}
                                     <tr>
                                         <td><a href="{url path='/admin/configuration/variables'}">{intl l='System variables'}</a></td>
                                         <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/variables'}"><i class="glyphicon glyphicon-edit"></i></a></td>
                                     </tr>
                                 {/loop}
 
-                                {loop type="auth" name="pcc3" roles="ADMIN" permissions="admin.configuration.profiles"}
+                                {loop type="auth" name="pcc3" role="ADMIN" resource="admin.configuration.profile" access="VIEW"}
                                     <tr>
                                         <td><a href="{url path='/admin/configuration/profiles'}">{intl l='Administration profiles'}</a></td>
                                         <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/profiles'}"><i class="glyphicon glyphicon-edit"></i></a></td>
                                     </tr>
                                 {/loop}
 
-                                {loop type="auth" name="pcc4" roles="ADMIN" permissions="admin.configuration.admin_users"}
+                                {loop type="auth" name="pcc4" role="ADMIN" resource="admin.configuration.administrator" access="VIEW"}
                                     <tr>
                                         <td><a href="{url path='/admin/configuration/administrators'}">{intl l='Administrators'}</a></td>
                                         <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/administrators'}"><i class="glyphicon glyphicon-edit"></i></a></td>
                                     </tr>
                                 {/loop}
 
-                                {loop type="auth" name="pcc5" roles="ADMIN" permissions="admin.configuration.languages"}
+                                {loop type="auth" name="pcc5" role="ADMIN" resource="admin.configuration.language" access="VIEW"}
                                     <tr>
                                         <td><a href="{url path='/admin/configuration/languages'}">{intl l='Languages &amp; URLs'}</a></td>
                                         <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/languages'}"><i class="glyphicon glyphicon-edit"></i></a></td>
                                     </tr>
                                 {/loop}
 
-                                {loop type="auth" name="pcc6" roles="ADMIN" permissions="admin.configuration.mailing_system"}
+                                {loop type="auth" name="pcc6" role="ADMIN" resource="admin.configuration.mailing-system" access="VIEW"}
                                     <tr>
                                         <td><a href="{url path='/admin/configuration/mailing_system'}">{intl l='Mailing system'}</a></td>
                                         <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/mailing_system'}"><i class="glyphicon glyphicon-edit"></i></a></td>
                                     </tr>
                                 {/loop}
 
-                                {loop type="auth" name="pcc7" roles="ADMIN" permissions="admin.configuration.admin_logs"}
+                                {loop type="auth" name="pcc7" role="ADMIN" resource="admin.configuration.admin-logs" access="VIEW"}
                                     <tr>
                                         <td><a href="{url path='/admin/configuration/admin_logs'}">{intl l='Administration logs'}</a></td>
                                         <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/admin_logs'}"><i class="glyphicon glyphicon-edit"></i></a></td>
                                     </tr>
                                 {/loop}
 
-                                {loop type="auth" name="pcc8" roles="ADMIN" permissions="admin.configuration.system_logs"}
+                                {loop type="auth" name="pcc8" role="ADMIN" resource="admin.configuration.system-logs" access="VIEW"}
                                     <tr>
                                         <td><a href="{url path='/admin/configuration/system_logs'}">{intl l='System logs'}</a></td>
                                         <td><a class="btn btn-default btn-xs" href="{url path='/admin/configuration/system_logs'}"><i class="glyphicon glyphicon-edit"></i></a></td>
diff --git a/templates/admin/default/countries.html b/templates/admin/default/countries.html
index ec89063ee..b2d18936e 100644
--- a/templates/admin/default/countries.html
+++ b/templates/admin/default/countries.html
@@ -28,7 +28,7 @@
                                 <table class="table table-striped table-condensed">
                                    <caption class="clearfix">
                                         {intl l='Countries'}
-                                        {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.countries.create"}
+                                        {loop type="auth" name="can_create" role="ADMIN" resource="admin.configuration.country" access="CREATE"}
                                             <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new country'}" href="#add_country_dialog" data-toggle="modal">
                                                 <span class="glyphicon glyphicon-plus-sign"></span>
                                             </a>
@@ -71,13 +71,13 @@
 
                                                 <td class="actions">
                                                     <div class="btn-group">
-                                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.countries.change"}
+                                                        {loop type="auth" name="can_change" role="ADMIN" resource="admin.configuration.country" access="UPDATE"}
                                                             <a class="btn btn-default btn-xs country-change" title="{intl l='Change this country'}" href="{url path="/admin/configuration/country/update/{$ID}"}">
                                                                 <span class="glyphicon glyphicon-edit"></span>
                                                             </a>
                                                         {/loop}
 
-                                                        {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.countries.delete"}
+                                                        {loop type="auth" name="can_delete" role="ADMIN" resource="admin.configuration.country" access="DELETE"}
                                                             <a class="btn btn-default btn-xs country-delete" title="{intl l='Delete this country'}" href="#delete_dialog" data-id="{$ID}" data-toggle="modal">
                                                                 <span class="glyphicon glyphicon-trash"></span>
                                                             </a>
diff --git a/templates/admin/default/currencies.html b/templates/admin/default/currencies.html
index aeebad06a..a7f334fde 100644
--- a/templates/admin/default/currencies.html
+++ b/templates/admin/default/currencies.html
@@ -28,7 +28,7 @@
                                 <table class="table table-striped table-condensed">
                                    <caption class="clearfix">
                                         {intl l='Currencies'}
-                                        {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.currencies.create"}
+                                        {loop type="auth" name="can_create" role="ADMIN" resource="admin.configuration.currency" access="CREATE"}
                                             <span class="pull-right">
                                                 <button class="btn btn-default btn-info" title="{intl l='Update rates'}">{intl l='Update rates'} <span class="glyphicon glyphicon-globe"></span></button>
                                                 <a class="btn btn-default btn-primary" title="{intl l='Add a new currency'}" href="#creation_dialog" data-toggle="modal">
@@ -122,7 +122,7 @@
                                                 <td>{$ID}</td>
 
                                                 <td>
-                                                    {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.currencies.change"}
+                                                    {loop type="auth" name="can_change" role="ADMIN" resource="admin.configuration.currency" access="UPDATE"}
                                                         <a title="{intl l='Change this currency'}" href="{url path='/admin/configuration/currencies/update' currency_id=$ID}">{$NAME}</a>
                                                     {/loop}
                                                     {elseloop rel="can_change"}
@@ -158,13 +158,13 @@
 
                                                 <td class="actions">
                                                     <div class="btn-group">
-                                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.currencies.change"}
+                                                        {loop type="auth" name="can_change" role="ADMIN" resource="admin.configuration.currency" access="UPDATE"}
                                                             <a class="btn btn-default btn-xs currency-change" title="{intl l='Change this currency'}" href="{url path='/admin/configuration/currencies/update' currency_id="$ID"}">
                                                                 <span class="glyphicon glyphicon-edit"></span>
                                                             </a>
                                                         {/loop}
 
-                                                        {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.currencies.delete"}
+                                                        {loop type="auth" name="can_delete" role="ADMIN" resource="admin.configuration.currency" access="DELETE"}
                                                             <a class="btn btn-default btn-xs currency-delete" title="{intl l='Delete this currency'}" href="#delete_dialog" data-id="{$ID}" data-toggle="modal">
                                                                 <span class="glyphicon glyphicon-trash"></span>
                                                             </a>
diff --git a/templates/admin/default/customers.html b/templates/admin/default/customers.html
index 80f5e317f..8fc937996 100644
--- a/templates/admin/default/customers.html
+++ b/templates/admin/default/customers.html
@@ -30,7 +30,7 @@
 
                                     {module_include location='customer_list_caption'}
 
-                                    {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.customers.create"}
+                                    {loop type="auth" name="can_create" role="ADMIN" resource="admin.customer" access="CREATE"}
                                         <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new Customer'}" href="#add_customer_dialog" data-toggle="modal">
                                             <span class="glyphicon glyphicon-plus-sign"></span>
                                         </a>
@@ -101,13 +101,13 @@
                                             <td>
                                                 <div class="btn-group">
 
-                                                    {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.customer.edit"}
+                                                    {loop type="auth" name="can_change" role="ADMIN" resource="admin.customer" access="UPDATE"}
                                                         <a class="btn btn-default btn-xs" title="{intl l='Edit this customer'}" href="{url path="/admin/customer/update/{$ID}" }"><i class="glyphicon glyphicon-edit"></i></a>
                                                     {/loop}
-                                                    {loop type="auth" name="can_send_mail" roles="ADMIN" permissions="admin.customer.sendMail"}
+                                                    {loop type="auth" name="can_send_mail" role="ADMIN" resource="admin.customer" access="VIEW"}
                                                         <a class="btn btn-default btn-xs" title="{intl l="Send a mail to this customer"}" href="mailto:{$EMAIL}"><span class="glyphicon glyphicon-envelope"></span></a>
                                                     {/loop}
-                                                    {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.customer.delete"}
+                                                    {loop type="auth" name="can_delete" role="ADMIN" resource="admin.customer" access="DELETE"}
                                                         <a class="btn btn-default btn-xs customer-delete" title="{intl l='Delete this customer and all his orders'}"  href="#delete_customer_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
                                                     {/loop}
                                                 </div>
diff --git a/templates/admin/default/feature-edit.html b/templates/admin/default/feature-edit.html
index 1d03e17ae..ca6bdc327 100644
--- a/templates/admin/default/feature-edit.html
+++ b/templates/admin/default/feature-edit.html
@@ -66,7 +66,7 @@
 
 		     						         {intl l='Feature values'}
 
-		                                     {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.feature-av.create"}
+		                                     {loop type="auth" name="can_create" role="ADMIN" resource="admin.configuration.feature" access="UPDATE"}
 		                                     <span class="pull-right">
 		                                         <a data-toggle="modal" href="#creation_dialog" title="Add a new feature value" class="btn btn-default btn-primary">
 		                                             <span class="glyphicon glyphicon-plus-sign"></span>
@@ -148,7 +148,7 @@
 
     				                                    <td class="actions">
     				                                        <div class="btn-group">
-    				                                            {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.feature-av.delete"}
+    				                                            {loop type="auth" name="can_create" role="ADMIN" resource="admin.configuration.feature" access="UPDATE"}
     				                                               <a class="btn btn-default btn-xs value-delete" title="{intl l='Delete this value'}" href="#delete_dialog" data-id="{$ID}" data-toggle="modal">
     				                                                <span class="glyphicon glyphicon-trash"></span>
     				                                               </a>
diff --git a/templates/admin/default/features.html b/templates/admin/default/features.html
index 649f7a9a3..550ef0876 100644
--- a/templates/admin/default/features.html
+++ b/templates/admin/default/features.html
@@ -27,7 +27,7 @@
     	                        <caption>
     	                           {intl l='Thelia product features'}
 
-                                    {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.features.create"}
+                                    {loop type="auth" name="can_create" role="ADMIN" resource="admin.configuration.feature" access="CREATE"}
                                     <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new product feature'}" href="#creation_dialog" data-toggle="modal">
                                         <span class="glyphicon glyphicon-plus-sign"></span>
                                     </a>
@@ -77,7 +77,7 @@
                                         <td>{$ID}</td>
 
                                         <td>
-                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.features.change"}
+                                            {loop type="auth" name="can_change" role="ADMIN" resource="admin.configuration.feature" access="UPDATE"}
                                                 <a title="{intl l='Change this feature'}" href="{url path='/admin/configuration/features/update' feature_id=$ID}">{$TITLE}</a>
                                             {/loop}
                                             {elseloop rel="can_change"}
@@ -100,7 +100,7 @@
                                         {module_include location='features_table_row'}
 
                                         <td class="actions">
-                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.features.change"}
+                                            {loop type="auth" name="can_change" role="ADMIN" resource="admin.configuration.feature" access="UPDATE"}
                                             <div class="btn-group">
                                                 <a class="btn btn-default btn-xs feature-remove-from-all" title="{intl l='Remove this feature from all product templates'}" href="#remove_from_all_dialog" data-id="{$ID}" data-toggle="modal">
                                                     <span class="glyphicon glyphicon-minus"></span>
@@ -112,11 +112,11 @@
                                             {/loop}
 
                                             <div class="btn-group">
-    	                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.features.change"}
+    	                                        {loop type="auth" name="can_change" role="ADMIN" resource="admin.configuration.feature" access="UPDATE"}
     	                                            <a class="btn btn-default btn-xs feature-change" title="{intl l='Change this product feature'}" href="{url path='/admin/configuration/features/update' feature_id=$ID}"><span class="glyphicon glyphicon-edit"></span></a>
     	                                        {/loop}
 
-    	                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.features.delete"}
+    	                                        {loop type="auth" name="can_change" role="ADMIN" resource="admin.configuration.feature" access="DELETE"}
     	                                            <a class="btn btn-default btn-xs feature-delete" title="{intl l='Delete this product feature'}" href="#delete_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
     	                                        {/loop}
                                             </div>
diff --git a/templates/admin/default/folder-edit.html b/templates/admin/default/folder-edit.html
index ed1c89830..7971a372f 100644
--- a/templates/admin/default/folder-edit.html
+++ b/templates/admin/default/folder-edit.html
@@ -222,7 +222,7 @@
 
 									            <td class="actions">
 									                <div class="btn-group">
-									                    {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.folder.content.delete"}
+									                    {loop type="auth" name="can_create" role="ADMIN" resource="admin.configuration.folder" access="UPDATE"}
 									                       <a class="btn btn-default btn-xs delete-content" title="{intl l='Delete this content'}" href="#delete_content_dialog" data-id="{$ID}" data-toggle="modal">
 									                        <span class="glyphicon glyphicon-trash"></span>
 									                       </a>
diff --git a/templates/admin/default/folders.html b/templates/admin/default/folders.html
index ba5fc7b8b..a81165dd1 100644
--- a/templates/admin/default/folders.html
+++ b/templates/admin/default/folders.html
@@ -36,7 +36,7 @@
                             </td>*}
                             {module_include location='folder_list_caption'}
 
-                            {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.folders.create"}
+                            {loop type="auth" name="can_create" role="ADMIN" resource="admin.folder" access="CREATE"}
                                 <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new folder'}" href="#folder_creation_dialog" data-toggle="modal">
                                     <span class="glyphicon glyphicon-plus-sign"></span>
                                 </a>
@@ -118,7 +118,7 @@
                                     {module_include location='folder_list_row'}
 
                                     <td>
-                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.folders.edit"}
+                                        {loop type="auth" name="can_change" role="ADMIN" resource="admin.folder" access="UPDATE"}
                                             <div class="make-switch switch-small folderVisibleToggle" data-id="{$ID}"  data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
                                                 <input type="checkbox" class="folderVisibleToggle" {if $VISIBLE == 1}checked="checked"{/if}>
                                             </div>
@@ -147,11 +147,11 @@
                                         <div class="btn-group">
                                             <a class="btn btn-default btn-xs" title="{intl l='Browse this folder'}" href="{url path='admin/folders' parent=$ID}"><i class="glyphicon glyphicon-folder-open"></i></a>
 
-                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.folders.edit"}
+                                            {loop type="auth" name="can_change" role="ADMIN" resource="admin.folder" access="UPDATE"}
                                                 <a class="btn btn-default btn-xs" title="{intl l='Edit this folder'}" href="{url path="/admin/folders/update/{$ID}"}"><i class="glyphicon glyphicon-edit"></i></a>
                                             {/loop}
 
-                                            {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.folders.delete"}
+                                            {loop type="auth" name="can_delete" role="ADMIN" resource="admin.folder" access="DELETE"}
                                                 <a class="btn btn-default btn-xs folder-delete" title="{intl l='Delete this folder and all its contents'}"  href="#folder_delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
                                             {/loop}
                                         </div>
@@ -166,7 +166,7 @@
                             <tr>
                                 <td class="message">
                                     <div class="alert alert-info">
-                                        {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.folders.create"}
+                                        {loop type="auth" name="can_create" role="ADMIN" resource="admin.folder" access="CREATE"}
                                         {intl l="This folder has no sub-folders. To create a new one, click the + button above."}
                                         {/loop}
 
@@ -274,7 +274,7 @@
                                     {module_include location='content_list_row'}
 
                                     <td>
-                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.contents.edit"}
+                                        {loop type="auth" name="can_change" role="ADMIN" resource="admin.content" access="UPDATE"}
                                             <div class="make-switch switch-small contentVisibleToggle" data-id="{$ID}"  data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
                                                 <input type="checkbox" class="contentVisibleToggle" {if $VISIBLE == 1}checked="checked"{/if}>
                                             </div>
@@ -301,11 +301,11 @@
 
                                     <td>
                                         <div class="btn-group">
-                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.content.edit"}
+                                            {loop type="auth" name="can_change" role="ADMIN" resource="admin.content" access="UPDATE"}
                                                 <a class="btn btn-default btn-xs" title="{intl l='Edit this content'}" href="{url path="admin/content/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
                                             {/loop}
 
-                                            {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.content.delete"}
+                                            {loop type="auth" name="can_delete" role="ADMIN" resource="admin.content" access="DELETE"}
                                                 <a class="btn btn-default btn-xs content-delete" title="{intl l='Delete this content'}"  href="#content_delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
                                             {/loop}
                                         </div>
diff --git a/templates/admin/default/includes/content-folder-management.html b/templates/admin/default/includes/content-folder-management.html
index f5bda8e4a..31f86e058 100644
--- a/templates/admin/default/includes/content-folder-management.html
+++ b/templates/admin/default/includes/content-folder-management.html
@@ -73,7 +73,7 @@
 
                                 <td class="actions">
                                     <div class="btn-group">
-                                        {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.product.category.delete"}
+                                        {loop type="auth" name="can_delete" role="ADMIN" resource="admin.category" access="UPDATE"}
                                             <a class="btn btn-default btn-xs delete-folder" title="{intl l='Remove the product from this category'}" href="#delete_folder_dialog" data-id="{$ID}" data-toggle="modal">
                                                 <span class="glyphicon glyphicon-trash"></span>
                                             </a>
diff --git a/templates/admin/default/includes/module-block.html b/templates/admin/default/includes/module-block.html
index 658557d4e..4380ab659 100644
--- a/templates/admin/default/includes/module-block.html
+++ b/templates/admin/default/includes/module-block.html
@@ -39,15 +39,15 @@
                     <td>
                         <div class="btn-group">
 
-                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.documentation"}
+                            {loop type="auth" name="can_change" role="ADMIN" resource="admin.modules" access="VIEW"}
                                 <a class="btn btn-default btn-xs" title="{intl l='Read the documentation of this module'}" href="{url path="/admin/module/documentation/$ID"}"><span class="glyphicon glyphicon-book"></span></a>
                             {/loop}
 
-                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.modules.edit"}
+                            {loop type="auth" name="can_change" role="ADMIN" resource="admin.modules" access="UPDATE"}
                                 <a class="btn btn-default btn-xs" title="{intl l='Edit this module'}" href="{url path="/admin/module/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
                             {/loop}
 
-                            {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.modules.delete"}
+                            {loop type="auth" name="can_delete" role="ADMIN" resource="admin.modules" access="DELETE"}
                                 <a class="btn btn-default btn-xs module-delete-action" title="{intl l='Delete this module'}"  href="#delete_module_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
                             {/loop}
                         </div>
diff --git a/templates/admin/default/includes/product-details-tab.html b/templates/admin/default/includes/product-details-tab.html
index 13e241e59..409191708 100644
--- a/templates/admin/default/includes/product-details-tab.html
+++ b/templates/admin/default/includes/product-details-tab.html
@@ -203,7 +203,7 @@
 
 					        {module_include location='product_combinations_list_caption'}
 
-					        {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.products.update"}
+					        {loop type="auth" name="can_create" role="ADMIN" resource="admin.product" access="UPDATE"}
 					        <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new combination'}" href="#combination_creation_dialog" data-toggle="modal">
 					            <span class="glyphicon glyphicon-plus-sign"></span>
 					        </a>
diff --git a/templates/admin/default/languages.html b/templates/admin/default/languages.html
index f6b259197..868d911be 100644
--- a/templates/admin/default/languages.html
+++ b/templates/admin/default/languages.html
@@ -27,7 +27,7 @@
                         <table class="table table-striped table-condensed table-left-aligned">
                             <caption>
                                {intl l="Languages management"}
-                               {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.languages.create"}
+                               {loop type="auth" name="can_create" role="ADMIN" resource="admin.configuration.language" access="CREATE"}
                                 <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new language'}" href="#creation_dialog" data-toggle="modal">
                                     <span class="glyphicon glyphicon-plus-sign"></span>
                                 </a>
diff --git a/templates/admin/default/messages.html b/templates/admin/default/messages.html
index 48d3383f1..8a4be251b 100644
--- a/templates/admin/default/messages.html
+++ b/templates/admin/default/messages.html
@@ -26,7 +26,7 @@
     	                    <table class="table table-striped table-condensed table-left-aligned">
     	                        <caption>
     	                           {intl l='Thelia mailing templates'}
-    	                           {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.messages.create"}
+    	                           {loop type="auth" name="can_create" role="ADMIN" resource="admin.configuration.message" access="CREATE"}
                                     <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new mailing template'}" href="#creation_dialog" data-toggle="modal">
                                         <span class="glyphicon glyphicon-plus-sign"></span>
                                     </a>
@@ -52,7 +52,7 @@
 
                                            <td>
                                            {if ! $SECURED}
-                                               {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.messages.change"}
+                                               {loop type="auth" name="can_change" role="ADMIN" resource="admin.configuration.message" access="UPDATE"}
                                                    <a title="{intl l='Change this mailing template'}" href="{url path='/admin/configuration/messages/update' message_id="$ID"}">{$NAME}</a>
                                                {/loop}
                                                {elseloop rel="can_change"}
@@ -68,11 +68,11 @@
         	                                <td class="actions">
         	                                    {if ! $SECURED}
         		                                    <div class="btn-group">
-                                                       {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.messages.change"}
+                                                       {loop type="auth" name="can_change" role="ADMIN" resource="admin.configuration.message" access="UPDATE"}
                                                            <a class="btn btn-default btn-xs message-change" title="{intl l='Change this mailing template'}" href="{url path='/admin/configuration/messages/update' message_id="$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
                                                        {/loop}
 
-                                                       {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.messages.delete"}
+                                                       {loop type="auth" name="can_delete" role="ADMIN" resource="admin.configuration.message" access="DELETE"}
                                                            <a class="btn btn-default btn-xs message-delete" title="{intl l='Delete this mailing template'}" href="#delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
                                                        {/loop}
         		                                    </div>
diff --git a/templates/admin/default/modules.html b/templates/admin/default/modules.html
index 9f9664e22..e6c6eb669 100644
--- a/templates/admin/default/modules.html
+++ b/templates/admin/default/modules.html
@@ -15,7 +15,7 @@
                 <li><a href="{url path='/admin/home'}">{intl l="Home"}</a></li>
                 <li><a href="{url path='/admin/modules'}">{intl l="Modules"}</a></li>
             </ul>
-            {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.modules.install"}
+            {loop type="auth" name="can_create" role="ADMIN" resource="admin.module" access="UPDATE"}
                 <a class="btn btn-default btn-primary pull-right" title="{intl l='Install a new module'}" href="#install_dialog" data-toggle="modal">
                     <span class="glyphicon glyphicon-import"></span> {intl l="Install a new module"}
                 </a>
diff --git a/templates/admin/default/orders.html b/templates/admin/default/orders.html
index 9edc56e9b..d237d228a 100644
--- a/templates/admin/default/orders.html
+++ b/templates/admin/default/orders.html
@@ -74,7 +74,7 @@
 		                                <td>
 		                                    <div class="btn-group">
 
-				                                {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.orders.update"}
+				                                {loop type="auth" name="can_change" role="ADMIN" resource="admin.order" access="UPDATE"}
 				                                   <a class="btn btn-default btn-xs" title="{intl l='Edit this order'}" href="{url path="/admin/order/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
                                                     {if $STATUS !== 5}
 				                                        <a class="btn btn-default btn-xs order-cancel" title="{intl l='Cancel this order'}" href="#cancel_order_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-remove-sign"></span></a>
diff --git a/templates/admin/default/profile-edit.html b/templates/admin/default/profile-edit.html
index db3cbd0e2..92a88efe2 100644
--- a/templates/admin/default/profile-edit.html
+++ b/templates/admin/default/profile-edit.html
@@ -118,111 +118,60 @@
 
                     <div class="tab-pane fade {if $oder_tab == 'permissions'}active in{/if}" id="permissions">
 
-                        <div class="col-md-12 title title-without-tabs">
-                            {intl l="Manage permissions"}
-                        </div>
-{*
-                        <div class="form-group">
-                            <label for="" class="label-control">{intl l="Choose a country"} :</label>
-                            <form id="country-selector-form" action="{url path="/admin/configuration/profiles/update/$profile_id"}" method="GET">
-                                <input type="hidden" name="tab" value="taxes">
-                                <select id="country-selector" name="country" data-toggle="selectpicker">
-                                    {loop type="country" name="country-list"}
-                                        <option value="{$ID}" {if $ID == $asked_country}selected="selected"{/if}>{$TITLE}</option>
-                                    {/loop}
-                                </select>
-                            </form>
-                        </div>
-
-                        <p><strong>{intl l="Countries that have the same profile"} :<strong></p>
-                        <p class="lead js-collapse" id="same_countries" data-collapse-height="86">
-
-                            {$matchedCountries.first=$asked_country}
-
-                            {loop type="profile-country" name="same-country-list" profile=$ID ask="countries" country=$asked_country}
-                            {$matchedCountries[]=$COUNTRY}
-                                <span class="label label-info">{$COUNTRY_TITLE}</span>
-                            {/loop}
-
-                            {elseloop rel="same-country-list"}
-                                <span class="label label-danger">{intl l="NONE"}</span>
-                            {/elseloop}
-                        </p>
-                        <button data-collapse-block="same_countries" type="button" class="btn btn-info btn-sm btn-block js-collapse-btn" style="margin-bottom: 15px">See all countries</button>
-
-                        <div class="row">
-                            <div class="col-md-6">
-
-                                <div id="panel" class="panel panel-default place">
-                                    <div class="panel-heading">
-                                        <h3 class="panel-title">{intl l="Manage the profile taxes appliance order"}</h3>
-                                    </div>
-                                    <div class="panel-body">
-                                        {assign lastPosition 0}
-                                        {loop type="profile-country" name="existing-tax-list" profile=$ID country=$asked_country}
-                                        {if $POSITION != $lastPosition}
-                                        {assign lastPosition $POSITION}
-                                        {if $LOOP_COUNT > 1}
-                                    </div>
-                                    {/if}
-                                    <div class="drop-group droppable add-to-group">
-                                        <p class="drop-message">
-                                            <span class="glyphicon glyphicon-plus"></span>
-                                            <span class="message">{intl l="Add tax to this group"}</span>
-                                        </p>
-                                        {/if}
-
-                                        <div class="drag" data-id="{$TAX}">{$TAX_TITLE}</div>
-
-                                        {if $LOOP_COUNT == $LOOP_TOTAL}
-                                    </div>
-                                    {/if}
-                                    {/loop}
-
-                                    {elseloop rel="existing-tax-list"}
-                                        <div class="drop-group droppable add-to-group">
-                                            <p class="drop-message">
-                                                <span class="glyphicon glyphicon-plus"></span>
-                                                <span class="message">{intl l="Add tax to this group"}</span>
-                                            </p>
+                        <table class="table table-striped table-condensed table-left-aligned">
+                            <caption>
+                                {intl l="Manage permissions"}
+                            </caption>
+                            <thead>
+                            <tr>
+                                <th rowspan="2">{intl l="Resource"}</th>
+                                <th rowspan="2">{intl l="Title"}</th>
+                                <th colspan="4" class="text-center">{intl l="Rights"}</th>
+                            </tr>
+                            <tr>
+                                <th>{intl l="View"}</th>
+                                <th>{intl l="Create"}</th>
+                                <th>{intl l="Update"}</th>
+                                <th>{intl l="Delete"}</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                                {loop type="resource" name="resource-list" profile=$ID backend_context="1"}
+                                <tr>
+                                    <td>{$CODE}</td>
+                                    <td>{$TITLE}</td>
+                                    <td>
+                                        <div class="make-switch switch-mini" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                            <input type="checkbox" {if $VIEWABLE == 1}checked="checked"{/if}>
                                         </div>
+                                    </td>
+                                    <td>
+                                        <div class="make-switch switch-mini" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                            <input type="checkbox" {if $CREATABLE == 1}checked="checked"{/if}>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <div class="make-switch switch-mini" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                            <input type="checkbox" {if $UPDATABLE == 1}checked="checked"{/if}>
+                                        </div>
+                                    </td>
+                                    <td>
+                                        <div class="make-switch switch-mini" data-on="success" data-off="danger" data-on-label="<i class='glyphicon glyphicon-ok'></i>" data-off-label="<i class='glyphicon glyphicon-remove'></i>">
+                                            <input type="checkbox" {if $DELETABLE == 1}checked="checked"{/if}>
+                                        </div>
+                                    </td>
+                                </tr>
+                                {/loop}
+                            </tbody>
+                            <tfoot>
+                            <tr>
+                                <td colspan="3">
+                                    <button type="submit" class="btn btn-default btn-primary pull-right"><span class="glyphicon glyphicon-check"></span> {intl l="Save"}</button>
+                                </td>
+                            </tr>
+                            </tfoot>
+                        </table>
 
-                                    {/elseloop}
-
-                                </div>
-                                <div class="panel-footer droppable create-group">
-                                    <p class="drop-message">
-                                        <span class="glyphicon glyphicon-plus"></span>
-                                        <span class="message">{intl l="Drop tax here to create a tax group"}</span>
-                                    </p>
-                                </div>
-                            </div>
-
-                            <a href="#tax_list_update_dialog" data-toggle="modal" id="apply-taxes-rules" class="btn btn-default btn-primary btn-block"><span class="glyphicon glyphicon-check"></span> {intl l="Apply"}</a>
-
-                        </div>
-                        <div class="col-md-6">
-
-                            <div id="panel-list" class="panel panel-default take">
-                                <div class="panel-heading">
-                                    <h3 class="panel-title">Available taxes</h3>
-                                </div>
-                                <div class="panel-body">
-                                    {loop type="tax" name="tax-list" exclude_profile=$ID country=$asked_country}
-                                        <div class="draggable" data-id="{$ID}">{$TITLE}</div>
-                                    {/loop}
-                                </div>
-                                <div class="panel-footer droppable remove-from-group">
-                                    <p class="drop-message">
-                                        <span class="glyphicon glyphicon-minus"></span>
-                                        <span class="message">{intl l="Drop tax here to delete from group"}</span>
-                                    </p>
-                                </div>
-                            </div>
-
-                        </div>
-
-                        *}
                     </div>
 
                 </div>
@@ -235,60 +184,6 @@
 
 </div>
 
-{* Confirmation dialog *}
-    {*form name="thelia.admin.profile.taxlistupdate"}
-
-    {if $form_error_message}
-        {$taxUpdateError = true}
-    {else}
-        {$taxUpdateError = false}
-    {/if}
-
-    {* Capture the dialog body, to pass it to the generic dialog *}
-    {*capture "tax_list_update_dialog"}
-
-        <input type="hidden" name="profile_id" value="{$profile_id}">
-        <input type="hidden" name="tab" value="taxes">
-
-        {form_hidden_fields form=$form}
-
-        {form_field form=$form field='country_list'}
-
-            <p>{intl l="Profile taxes will be update for the following countries :"}</p>
-            <div class="form-group">
-                <div class="input-group">
-                    <select id="countries-select" class="" name="{$name}" data-toggle="selectpicker" multiple>
-                        {loop type="country" name="country-list"}
-                            <option value='{$ID}' {if (!$value AND in_array($ID, $matchedCountries)) OR ($value AND in_array($ID, $value))}selected="selected"{/if}>{$TITLE}</option>
-                        {/loop}
-                    </select>
-                    <span class="input-group-btn">
-                        <button class="btn btn-primary js-uncheck-all" data-uncheck-select="countries-select">{intl l="uncheck all"}</button>
-                    </span>
-                </div>
-            </div>
-
-        {/form_field}
-
-    {/capture}
-
-        {include
-        file = "includes/generic-create-dialog.html"
-
-        dialog_id    = "tax_list_update_dialog"
-        dialog_title = {intl l="Update profile taxes"}
-        dialog_body  = {$smarty.capture.tax_list_update_dialog nofilter}
-
-    dialog_ok_label     = {intl l="Edit profile taxes"}
-    dialog_cancel_label = {intl l="Cancel"}
-
-    form_action        = {url path="/admin/configuration/profiles/saveTaxes"}
-    form_enctype       = {form_enctype form=$form}
-    form_error_message = $form_error_message
-    }
-
-    {/form*}
-
 {/block}
 
 {block name="javascript-initialization"}
@@ -297,6 +192,10 @@
         <script src='{$asset_url}'></script>
     {/javascripts}
 
+    {javascripts file='assets/js/bootstrap-switch/bootstrap-switch.js'}
+        <script src="{$asset_url}"></script>
+    {/javascripts}
+
     {javascripts file='assets/js/main.js'}
         <script src='{$asset_url}'></script>
     {/javascripts}
diff --git a/templates/admin/default/profiles.html b/templates/admin/default/profiles.html
index 3bb18be31..7c4950b02 100644
--- a/templates/admin/default/profiles.html
+++ b/templates/admin/default/profiles.html
@@ -28,7 +28,7 @@
                         <table class="table table-striped table-condensed table-left-aligned">
                             <caption class="clearfix">
                                 {intl l="Taxes"}
-                                {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.profile.create"}
+                                {loop type="auth" name="can_create" role="ADMIN" resource="admin.profile" access="CREATE"}
                                     <a class="btn btn-default btn-primary pull-right" title="{intl l='Create a new profile'}" href="#profile_create_dialog" data-toggle="modal">
                                         <span class="glyphicon glyphicon-plus"></span>
                                     </a>
@@ -50,13 +50,13 @@
                                     <td>{$DESCRIPTION}</td>
                                     <td>
                                         <div class="btn-group">
-                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.profile.change"}
+                                            {loop type="auth" name="can_change" role="ADMIN" resource="admin.configuration.profile" access="UPDATE"}
                                                 <a class="btn btn-default btn-xs" title="{intl l='Change this profile'}" href="{url path="/admin/configuration/profiles/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
                                             {/loop}
 
                                             {assign linkedAdminCount {count name="linked-admin" type="admin" profile=$ID}}
 
-                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.profile.change"}
+                                            {loop type="auth" name="can_delete" role="ADMIN" resource="admin.configuration.profile" access="DELETE"}
                                                 <a class="btn btn-default btn-xs js-delete-profile" title="{intl l='Delete this profile'}" href="#{if $linkedAdminCount > 0}profile_cannot_delete_dialog{else}profile_delete_dialog{/if}" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
                                             {/loop}
                                         </div>
diff --git a/templates/admin/default/shipping-configuration.html b/templates/admin/default/shipping-configuration.html
index b488b5eb1..2f0892c1f 100644
--- a/templates/admin/default/shipping-configuration.html
+++ b/templates/admin/default/shipping-configuration.html
@@ -25,7 +25,7 @@
                         <table class="table table-striped table-condensed table-left-aligned">
                             <caption class="clearfix">
                                 {intl l='Thelia Shipping configuration'}
-                                {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.shipping-configuration.create"}
+                                {loop type="auth" name="can_create" role="ADMIN" resource="admin.configuration.shipping-configuration" access="CREATE"}
                                 <a class="btn btn-default btn-primary pull-right" title="{intl l='Add a new shipping configuration'}" href="#creation_dialog" data-toggle="modal">
                                     <span class="glyphicon glyphicon-plus-sign"></span>
                                 </a>
@@ -50,10 +50,10 @@
 
                                     <td>
                                         <div class="btn-group">
-                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.shipping-configuration.change"}
+                                            {loop type="auth" name="can_change" role="ADMIN" resource="admin.configuration.shipping-configuration" access="UPDATE"}
                                                <a class="btn btn-default btn-xs area-configuration-change" title="{intl l='Change this shipping configuration'}" href="{url path="/admin/configuration/shipping_configuration/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
                                             {/loop}
-                                            {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.shipping-configuration.delete"}
+                                            {loop type="auth" name="can_delete" role="ADMIN" resource="admin.configuration.shipping-configuration" access="DELETE"}
                                                 <a class="btn btn-default btn-xs area-configuration-delete" title="{intl l='Delete this shipping configuration'}"  href="#delete_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
                                             {/loop}
                                         </div>
diff --git a/templates/admin/default/shipping-zones.html b/templates/admin/default/shipping-zones.html
index bff616cf8..29e2ba346 100644
--- a/templates/admin/default/shipping-zones.html
+++ b/templates/admin/default/shipping-zones.html
@@ -45,7 +45,7 @@
 
                                     <td>
                                         <div class="btn-group">
-                                           {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.shipping-zones.change"}
+                                           {loop type="auth" name="can_change" role="ADMIN" resource="admin.configuration.shipping-zone" access="UPDATE"}
                                                <a class="btn btn-default btn-xs shipping-zones-change" title="{intl l='Change this shipping zone'}" href="{url path="/admin/configuration/shipping_zones/update/$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
                                            {/loop}
                                         </div>
diff --git a/templates/admin/default/taxes-rules.html b/templates/admin/default/taxes-rules.html
index 0a48d18a1..15b7ae614 100644
--- a/templates/admin/default/taxes-rules.html
+++ b/templates/admin/default/taxes-rules.html
@@ -48,7 +48,7 @@
                             <table class="table table-striped table-condensed table-left-aligned">
                                 <caption class="clearfix">
                                     {intl l="Taxes"}
-                                    {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.taxes.create"}
+                                    {loop type="auth" name="can_create" role="ADMIN" resource="admin.configuration.tax" access="CREATE"}
                                         <a class="btn btn-default btn-primary pull-right" title="{intl l='Create a new tax'}" href="#tax_create_dialog" data-toggle="modal">
                                             <span class="glyphicon glyphicon-plus"></span>
                                         </a>
@@ -70,11 +70,11 @@
                                         <td>{$DESCRIPTION}</td>
                                         <td>
                                             <div class="btn-group">
-                                                {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.taxes.change"}
+                                                {loop type="auth" name="can_change" role="ADMIN" resource="admin.configuration.tax" access="UPDATE"}
                                                     <a class="btn btn-default btn-xs" title="{intl l='Change this tax'}" href="{url path="/admin/configuration/taxes/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
                                                 {/loop}
 
-                                                {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.taxes.change"}
+                                                {loop type="auth" name="can_change" role="ADMIN" resource="admin.configuration.tax" access="UPDATE"}
                                                     <a class="btn btn-default btn-xs js-delete-tax" title="{intl l='Delete this tax'}" href="#tax_delete_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
                                                 {/loop}
                                             </div>
@@ -93,7 +93,7 @@
                             <table class="table table-striped table-condensed table-left-aligned">
                                 <caption class="clearfix">
                                     {intl l="Taxes rules"}
-                                    {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.taxes-rules.create"}
+                                    {loop type="auth" name="can_create" role="ADMIN" resource="admin.configuration.tax" access="UPDATE"}
                                         <a class="btn btn-default btn-primary pull-right" title="{intl l='Create a new tax rule'}" href="#tax_rule_create_dialog" data-toggle="modal">
                                             <span class="glyphicon glyphicon-plus"></span>
                                         </a>
@@ -121,12 +121,12 @@
                                         </td>
                                         <td>
                                             <div class="btn-group">
-                                                {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.taxes-rules.change"}
+                                                {loop type="auth" name="can_change" role="ADMIN" resource="admin.configuration.tax" access="UPDATE"}
                                                     <a class="btn btn-default btn-xs" title="{intl l='Change this tax rule'}" href="{url path="/admin/configuration/taxes_rules/update/$ID"}"><span class="glyphicon glyphicon-edit"></span></a>
                                                     <a class="btn btn-default btn-xs" title="{intl l='Set as default tax rule'}" href="{url path="/admin/configuration/taxes_rules/update/set_default/$ID"}" {if $IS_DEFAULT == 1}disabled{/if}><span class="glyphicon glyphicon-star"></span></a>
                                                 {/loop}
 
-                                                {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.taxes-rules.dele"}
+                                                {loop type="auth" name="can_change" role="ADMIN" resource="admin.configuration.tax" access="DELETE"}
                                                     <a class="btn btn-default btn-xs js-delete-tax-rule" title="{intl l='Delete this tax rule'}" href="#tax_rule_delete_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
                                                 {/loop}
                                             </div>
diff --git a/templates/admin/default/templates.html b/templates/admin/default/templates.html
index 95d92d1a9..42b874cfd 100644
--- a/templates/admin/default/templates.html
+++ b/templates/admin/default/templates.html
@@ -32,7 +32,7 @@
     	                        <caption>
     	                           {intl l='Thelia product templates'}
 
-                                    {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.templates.create"}
+                                    {loop type="auth" name="can_create" role="ADMIN" resource="admin.configuration.template" access="CREATE"}
                                     <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new product template'}" href="#creation_dialog" data-toggle="modal">
                                         <span class="glyphicon glyphicon-plus-sign"></span>
                                     </a>
@@ -72,7 +72,7 @@
                                         <td>{$ID}</td>
 
                                         <td>
-                                            {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.templates.change"}
+                                            {loop type="auth" name="can_change" role="ADMIN" resource="admin.configuration.template" access="UPDATE"}
                                                 <a title="{intl l='Change this template'}" href="{url path='/admin/configuration/templates/update' template_id=$ID}">{$NAME}</a>
                                             {/loop}
                                             {elseloop rel="can_change"}
@@ -84,11 +84,11 @@
 
                                         <td class="actions">
                                             <div class="btn-group">
-    	                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.templates.change"}
+    	                                        {loop type="auth" name="can_change" role="ADMIN" resource="admin.configuration.template" access="UPDATE"}
     	                                            <a class="btn btn-default btn-xs template-change" title="{intl l='Change this product template'}" href="{url path='/admin/configuration/templates/update' template_id=$ID}"><span class="glyphicon glyphicon-edit"></span></a>
     	                                        {/loop}
 
-    	                                        {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.templates.delete"}
+    	                                        {loop type="auth" name="can_change" role="ADMIN" resource="admin.configuration.template" access="DELETE"}
     	                                            <a class="btn btn-default btn-xs template-delete" title="{intl l='Delete this product template'}" href="#delete_dialog" data-id="{$ID}" data-toggle="modal"><span class="glyphicon glyphicon-trash"></span></a>
     	                                        {/loop}
                                             </div>
diff --git a/templates/admin/default/variables.html b/templates/admin/default/variables.html
index a7a2b9c09..7cdad3afc 100644
--- a/templates/admin/default/variables.html
+++ b/templates/admin/default/variables.html
@@ -26,7 +26,7 @@
 	                    <table class="table table-striped table-condensed table-left-aligned">
 	                        <caption class="clearfix">
 	                           {intl l='Thelia system variables'}
-	                           {loop type="auth" name="can_create" roles="ADMIN" permissions="admin.configuration.variables.create"}
+	                           {loop type="auth" name="can_create" role="ADMIN" resource="admin.configuration.variable" access="CREATE"}
                                <div class="pull-right">
                                   <a class="btn btn-default btn-primary action-btn" title="{intl l='Add a new variable'}" href="#creation_dialog" data-toggle="modal">
                                       <span class="glyphicon glyphicon-plus-sign"></span>
@@ -82,7 +82,7 @@
 
                                      <td>
                                      {if ! $SECURED}
-                                         {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.variables.change"}
+                                         {loop type="auth" name="can_change" role="ADMIN" resource="admin.configuration.variable" access="UPDATE"}
                                              <a title="{intl l='Change this variable'}" href="{url path='/admin/configuration/variables/update' variable_id="$ID"}">{$NAME}</a>
                                          {/loop}
                                          {elseloop rel="can_change"}
@@ -108,11 +108,11 @@
   		                                    <div class="btn-group">
                                                  <a class="btn btn-default btn-xs cancel-edit" id="cancel_edit_btn_{$ID}" data-id="{$ID}" title="{intl l='Cancel changes and revert to original value'}" href="#"><i class="glyphicon glyphicon-remove"></i></a>
 
-                                                 {loop type="auth" name="can_change" roles="ADMIN" permissions="admin.configuration.variables.change"}
+                                                 {loop type="auth" name="can_change" role="ADMIN" resource="admin.configuration.variable" access="UPDATE"}
                                                      <a class="btn btn-default btn-xs config-change" title="{intl l='Change this variable'}" href="{url path='/admin/configuration/variables/update' variable_id="$ID"}"><i class="glyphicon glyphicon-edit"></i></a>
                                                  {/loop}
 
-                                                 {loop type="auth" name="can_delete" roles="ADMIN" permissions="admin.configuration.variables.delete"}
+                                                 {loop type="auth" name="can_delete" role="ADMIN" resource="admin.configuration.variable" access="DELETE"}
                                                      <a class="btn btn-default btn-xs config-delete" title="{intl l='Delete this variable'}" href="#delete_variable_dialog" data-id="{$ID}" data-toggle="modal"><i class="glyphicon glyphicon-trash"></i></a>
                                                  {/loop}
   		                                    </div>
diff --git a/templates/default/layout.tpl b/templates/default/layout.tpl
index 22e8cb5a5..fcbe4a840 100644
--- a/templates/default/layout.tpl
+++ b/templates/default/layout.tpl
@@ -67,7 +67,7 @@ URL: http://www.thelia.net
             <nav class="navbar-collapse collapse nav-main" role="navigation" aria-label="{intl l="Main Navigation"}">
                 {nocache}
                 <ul class="nav navbar-nav navbar-cart navbar-right">
-                    {loop type="auth" name="customer_info_block" roles="CUSTOMER" context="front"}
+                    {loop type="auth" name="customer_info_block" role="CUSTOMER" context="front"}
                         <li><a href="{url path="/logout"}" class="logout">{intl l="Log out!"}</a></li>
                         <li><a href="{url path="/account"}" class="account">{intl l="My Account"}</a></li>
                     {/loop}