diff --git a/addons/subscription/__openerp__.py b/addons/subscription/__openerp__.py
index 81a9995e868..2d972042959 100644
--- a/addons/subscription/__openerp__.py
+++ b/addons/subscription/__openerp__.py
@@ -20,7 +20,10 @@ e.g. To have an invoice generated automatically periodically:
     """,
     'author': 'OpenERP SA',
     'depends': ['base'],
-    'data': ['security/subcription_security.xml', 'security/ir.model.access.csv', 'subscription_view.xml'],
+    'data': [
+        'security/ir.model.access.csv',
+        'subscription_view.xml'
+    ],
     'demo': ['subscription_demo.xml',],
     'installable': True,
     'auto_install': False,
diff --git a/addons/subscription/security/ir.model.access.csv b/addons/subscription/security/ir.model.access.csv
index 33ca44c38f0..5d19f4d24c8 100644
--- a/addons/subscription/security/ir.model.access.csv
+++ b/addons/subscription/security/ir.model.access.csv
@@ -1,7 +1,7 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_subscription_document_fields,subscription.document.fields,model_subscription_document_fields,base.group_tool_manager,1,1,1,1
-access_subscription_subscription_user,subscription.subscription user,model_subscription_subscription,base.group_tool_user,1,1,1,1
-access_subscription_subscription_history_user,subscription.subscription.history user,model_subscription_subscription_history,base.group_tool_user,1,1,1,1
-access_subscription_document_user,subscription.document user,model_subscription_document,base.group_tool_user,1,1,1,1
-access_res_partner_user,res.partner.user,base.model_res_partner,base.group_tool_user,1,1,1,1
-access_ir_cron_user,ir.cron.user,base.model_ir_cron,base.group_tool_user,1,1,1,1
+access_subscription_document_fields,subscription.document.fields,model_subscription_document_fields,base.group_sale_manager,1,1,1,1
+access_subscription_subscription_user,subscription.subscription user,model_subscription_subscription,base.group_sale_salesman,1,1,1,1
+access_subscription_subscription_history_user,subscription.subscription.history user,model_subscription_subscription_history,base.group_sale_salesman,1,1,1,1
+access_subscription_document_user,subscription.document user,model_subscription_document,base.group_sale_salesman,1,1,1,1
+access_res_partner_user,res.partner.user,base.model_res_partner,base.group_sale_salesman,1,1,1,1
+access_ir_cron_user,ir.cron.user,base.model_ir_cron,base.group_sale_salesman,1,1,1,1
diff --git a/addons/subscription/security/subcription_security.xml b/addons/subscription/security/subcription_security.xml
deleted file mode 100644
index 46293a97561..00000000000
--- a/addons/subscription/security/subcription_security.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-<data noupdate="0">
-
-    <record model="res.groups" id="base.group_tool_user">
-        <field name="name">User</field>
-        <field name="category_id" ref="base.module_category_tools"/>
-    </record>
-    <record model="res.groups" id="base.group_tool_manager">
-        <field name="name">Manager</field>
-        <field name="category_id" ref="base.module_category_tools"/>
-        <field name="implied_ids" eval="[(4, ref('base.group_tool_user'))]"/>
-        <field name="users" eval="[(4, ref('base.user_root'))]"/>
-    </record>
-
-</data>
-</openerp>
diff --git a/addons/subscription/subscription_demo.xml b/addons/subscription/subscription_demo.xml
index 8db13eac548..454f8d51fed 100644
--- a/addons/subscription/subscription_demo.xml
+++ b/addons/subscription/subscription_demo.xml
@@ -2,7 +2,7 @@
 <openerp>
     <data>
         <record id="base.user_demo" model="res.users">
-            <field eval="[(4, ref('base.group_tool_user'))]" name="groups_id"/>
+            <field eval="[(4, ref('base.group_sale_salesman'))]" name="groups_id"/>
         </record>
     
         <record id="subscription_document_partner0" model="subscription.document">
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index dccd35b4cac..6c9b1a8403f 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -18,7 +18,7 @@
                     <group col="4">
                         <field name="name"/>
                         <field name="partner_id"/>
-                        <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_invoice', 'base.group_tool_user']}"/>
+                        <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_invoice', 'base.group_sale_salesman']}"/>
                         <field name="active"/>
                     </group>
                     <notebook>
diff --git a/openerp/addons/base/module/module_data.xml b/openerp/addons/base/module/module_data.xml
index f091dd0bb1a..02b11275738 100644
--- a/openerp/addons/base/module/module_data.xml
+++ b/openerp/addons/base/module/module_data.xml
@@ -66,12 +66,6 @@
             <field name="sequence">10</field>
         </record>
 
-        <record model="ir.module.category" id="module_category_tools">
-            <field name="name">Extra Tools</field>
-            <field name="description">Lets you install various interesting but non-essential tools like Survey, Lunch and Ideas box.</field>
-            <field name="sequence">11</field>
-        </record>
-
         <record model="ir.module.category" id="module_category_marketing">
             <field name="name">Marketing</field>
             <field name="description">Helps you manage your marketing campaigns step by step.</field>
@@ -130,7 +124,7 @@
         </record>
 
         <record model="res.groups" id="group_multi_company">
-            <field name="category_id" ref="module_category_usability"/>
+            <field name="category_id" ref="module_category_extra"/>
         </record>
 
         <record model="res.groups" id="group_multi_currency">