diff --git a/addons/account_budget/__openerp__.py b/addons/account_budget/__openerp__.py
index 889935e7528..3e4318b7da9 100644
--- a/addons/account_budget/__openerp__.py
+++ b/addons/account_budget/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Budget Management',
     'version': '1.0',
-    'category': 'Accounting & Finance',
+    'category': 'Project Management',
     'complexity': "normal",
     'description': """
 This module allows accountants to manage analytic and crossovered budgets.
diff --git a/addons/account_voucher/__openerp__.py b/addons/account_voucher/__openerp__.py
index 53fde3da8dc..87d009d2e14 100644
--- a/addons/account_voucher/__openerp__.py
+++ b/addons/account_voucher/__openerp__.py
@@ -32,7 +32,7 @@ Account Voucher module includes all the basic requirements of Voucher Entries fo
     * Voucher Receipt
     * Cheque Register
     """,
-    "category" : "Accounting & Finance",
+    "category" : "Manufacturing",
     "website" : "http://tinyerp.com",
     "images" : ["images/customer_payment.jpeg","images/journal_voucher.jpeg","images/sales_receipt.jpeg","images/supplier_voucher.jpeg"],
     "depends" : ["account"],
diff --git a/addons/association/__openerp__.py b/addons/association/__openerp__.py
index 51d44bf681d..ba70167fd24 100644
--- a/addons/association/__openerp__.py
+++ b/addons/association/__openerp__.py
@@ -23,8 +23,7 @@
 {
     'name': 'Association profile',
     'version': '0.1',
-    'category': 'General',
-    'category': 'Profile',
+    'category': 'Associations',
     'complexity': "normal",
     'description': """
 This module is to configure modules related to an association.
diff --git a/addons/auction/__openerp__.py b/addons/auction/__openerp__.py
index e1ceaf9921c..b1deafca157 100644
--- a/addons/auction/__openerp__.py
+++ b/addons/auction/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Auction Management',
     'version': '1.0',
-    'category': 'General',
+    'category': 'Associations',
     'complexity': "normal",
     'description': """
 This module manages the records of artists, auction articles, buyers and sellers.
diff --git a/addons/base_report_creator/__openerp__.py b/addons/base_report_creator/__openerp__.py
index 6c0a01f78fd..57aa22b95f4 100644
--- a/addons/base_report_creator/__openerp__.py
+++ b/addons/base_report_creator/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Statistical Report Creator',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Advanced Reporting',
     'complexity': "expert",
     'description': """
 This module allows you to create any statistic report on several objects.
diff --git a/addons/base_report_designer/__openerp__.py b/addons/base_report_designer/__openerp__.py
index c5bbbbd34ec..24a7d093b78 100644
--- a/addons/base_report_designer/__openerp__.py
+++ b/addons/base_report_designer/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'OpenOffice Report Designer Interface',
     'version': '0.1',
-    'category': 'Tools',
+    'category': 'Advanced Reporting',
     'complexity': "normal",
     'description': """
 This module is used along with OpenERP OpenOffice Plugin.
diff --git a/addons/crm_profiling/__openerp__.py b/addons/crm_profiling/__openerp__.py
index 70d30ae3cae..2ca6b5ec7c3 100644
--- a/addons/crm_profiling/__openerp__.py
+++ b/addons/crm_profiling/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'CRM Profiling Management - To Perform Segmentation within Partners',
     'version': '1.3',
-    'category': 'Customer Relationship Management',
+    'category': 'Marketing',
     'complexity': "easy",
     'description': """
 This module allows users to perform segmentation within partners.
diff --git a/addons/delivery/__openerp__.py b/addons/delivery/__openerp__.py
index fd03eb81c60..b110b8e6172 100644
--- a/addons/delivery/__openerp__.py
+++ b/addons/delivery/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Carriers and Deliveries',
     'version': '1.0',
-    'category': 'Warehouse Management',
+    'category': 'Sales Management',
     'complexity': "normal",
     'description': """
 Allows you to add delivery methods in sale orders and picking.
diff --git a/addons/email_template/__openerp__.py b/addons/email_template/__openerp__.py
index e5f83f9ac0c..f3ada96563f 100644
--- a/addons/email_template/__openerp__.py
+++ b/addons/email_template/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.1",
     "author" : "Openlabs",
     "website" : "http://openerp.com",
-    "category" : "Tools",
+    "category" : "Marketing",
     'complexity': "expert",
     "depends" : ['mail'],
     "description": """
diff --git a/addons/event_project/__openerp__.py b/addons/event_project/__openerp__.py
index ddd32c37631..2fbb280083f 100644
--- a/addons/event_project/__openerp__.py
+++ b/addons/event_project/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Event Project - Create Retro-Planning to manage your Events',
     'version': '0.1',
-    'category': 'Tools',
+    'category': 'Associations',
     'complexity': "easy",
     'description': """
 Organization and management of events.
diff --git a/addons/fetchmail/__openerp__.py b/addons/fetchmail/__openerp__.py
index 986c3bc12a1..d27199b1b30 100644
--- a/addons/fetchmail/__openerp__.py
+++ b/addons/fetchmail/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.0",
     "depends" : ["base", 'mail'],
     "author" : "OpenERP SA",
-    "category": 'Tools',
+    "category": 'Customer Relationship Management',
     "description": """
 Retrieve incoming email on POP / IMAP servers
 =============================================
diff --git a/addons/idea/__openerp__.py b/addons/idea/__openerp__.py
index 2a561a93b81..2e40992f2cf 100644
--- a/addons/idea/__openerp__.py
+++ b/addons/idea/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Idea Manager',
     'version': '0.1',
-    'category': 'Tools',
+    'category': 'Extra Tools',
     'complexity': "easy",
     'description': """
 This module allows your user to easily and efficiently participate in enterprise innovation.
diff --git a/addons/import_sugarcrm/__openerp__.py b/addons/import_sugarcrm/__openerp__.py
index 2c36ec77bfa..ff083e94bb4 100644
--- a/addons/import_sugarcrm/__openerp__.py
+++ b/addons/import_sugarcrm/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Import SugarCRM Data into OpenERP Module.',
     'version': '1.0',
-    'category': 'Tools/Importation',
+    'category': 'Customer Relationship Management',
     'description': """This Module Import SugarCRM "Leads", "Opportunities", "Users", "Accounts", 
             "Contacts", "Employees", Meetings, Phonecalls, Emails, and Project, Project Tasks Data into OpenERP Module.""",
     'author': 'OpenERP SA',
diff --git a/addons/lunch/__openerp__.py b/addons/lunch/__openerp__.py
index d2f91c6f040..16d3129f3b7 100644
--- a/addons/lunch/__openerp__.py
+++ b/addons/lunch/__openerp__.py
@@ -33,7 +33,7 @@
     """,
     "version": "0.1",
     "depends": ["base_tools"],
-    "category" : "Tools",
+    "category" : "Extra Tools",
     'description': """
     The base module to manage lunch
 
diff --git a/addons/marketing/__openerp__.py b/addons/marketing/__openerp__.py
index edb2ac087ed..1f1995c52da 100644
--- a/addons/marketing/__openerp__.py
+++ b/addons/marketing/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.1",
     "depends" : ["base", "base_setup"],
     "author" : "OpenERP SA",
-    "category": 'Sales Management',
+    "category": 'Marketing',
     'complexity': "expert",
     "description": """
 Menu for Marketing.
diff --git a/addons/marketing_campaign/__openerp__.py b/addons/marketing_campaign/__openerp__.py
index 86431fbd3ba..c94eaf76356 100644
--- a/addons/marketing_campaign/__openerp__.py
+++ b/addons/marketing_campaign/__openerp__.py
@@ -29,7 +29,7 @@
                  "decimal_precision"
                 ],
     "author" : "OpenERP SA",
-    "category": 'Customer Relationship Management',
+    "category": 'Marketing',
     'complexity': "expert",
     "description": """
 This module provides leads automation through marketing campaigns (campaigns can in fact be defined on any resource, not just CRM Leads).
diff --git a/addons/outlook/__openerp__.py b/addons/outlook/__openerp__.py
index e376bcfa34a..08e33734317 100644
--- a/addons/outlook/__openerp__.py
+++ b/addons/outlook/__openerp__.py
@@ -26,7 +26,7 @@
     'author' : 'OpenERP SA',
     'website' : 'http://www.openerp.com/',
     'depends' : ['base', 'mail'],
-    'category' : 'Tools',
+    'category' : 'Customer Relationship Management',
     'description': '''
 This module provides the Outlook Plug-in.
 =========================================
diff --git a/addons/pad/__openerp__.py b/addons/pad/__openerp__.py
index b3429dde329..6d2fcf63fb4 100644
--- a/addons/pad/__openerp__.py
+++ b/addons/pad/__openerp__.py
@@ -2,7 +2,7 @@
 {
     'name': 'Enhanced support for (Ether)Pad attachments',
     'version': '1.0.3',
-    'category': 'Tools',
+    'category': 'Extra Tools',
     'complexity': "easy",
     'description': """
 Adds enhanced support for (Ether)Pad attachments in the web client.
diff --git a/addons/point_of_sale/__openerp__.py b/addons/point_of_sale/__openerp__.py
index a03b673893a..cc73364716c 100644
--- a/addons/point_of_sale/__openerp__.py
+++ b/addons/point_of_sale/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Point Of Sale',
     'version': '1.0',
-    'category': 'Sales Management',
+    'category': 'Marketing',
     'description': """
 This module provides a quick and easy sale process.
 ===================================================
diff --git a/addons/product_expiry/__openerp__.py b/addons/product_expiry/__openerp__.py
index 68d928708e6..65a9585f684 100644
--- a/addons/product_expiry/__openerp__.py
+++ b/addons/product_expiry/__openerp__.py
@@ -21,7 +21,7 @@
     "name" : "Products Expiry Date",
     "version" : "1.0",
     "author" : "OpenERP SA",
-    "category" : "Warehouse Management",
+    "category" : "Associations",
     'complexity': "easy",
     "depends" : ["stock"],
     "init_xml" : [],
diff --git a/addons/sale_crm/__openerp__.py b/addons/sale_crm/__openerp__.py
index 56831f05cbe..60463a20b02 100644
--- a/addons/sale_crm/__openerp__.py
+++ b/addons/sale_crm/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Creates Sales order from Opportunity',
     'version': '1.0',
-    'category': 'Sales Management',
+    'category': 'Customer Relationship Management',
     'complexity': "easy",
     'description': """
 This module adds a shortcut on one or several opportunity cases in the CRM.
diff --git a/addons/share/__openerp__.py b/addons/share/__openerp__.py
index 52ffa165c14..4eb48f69e77 100644
--- a/addons/share/__openerp__.py
+++ b/addons/share/__openerp__.py
@@ -25,7 +25,7 @@
     "version" : "1.5",
     "depends" : ["base", "mail"],
     "author" : "OpenERP SA",
-    "category": 'Tools',
+    "category": 'Extra Tools',
     'complexity': "easy",
     "description": """
 This module adds generic sharing tools to your current OpenERP database.
diff --git a/addons/stock/__openerp__.py b/addons/stock/__openerp__.py
index 5b1d392a592..94b9e10fe73 100644
--- a/addons/stock/__openerp__.py
+++ b/addons/stock/__openerp__.py
@@ -47,7 +47,7 @@ Thanks to the double entry management, the inventory controlling is powerful and
     "website" : "http://www.openerp.com",
     "images" : ["images/stock_forecast_report.png", "images/delivery_orders.jpeg", "images/inventory_analysis.jpeg","images/location.jpeg","images/moves_analysis.jpeg","images/physical_inventories.jpeg","images/warehouse_dashboard.jpeg"],
     "depends" : ["product", "account"],
-    "category" : "Warehouse Management",
+    "category" : "Knowledge Management",
     "init_xml" : [],
     "demo_xml" : ["stock_demo.xml"],
     "update_xml" : [
diff --git a/addons/stock_location/__openerp__.py b/addons/stock_location/__openerp__.py
index 025b3b3e881..d70bf098682 100644
--- a/addons/stock_location/__openerp__.py
+++ b/addons/stock_location/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Warehouse Locations Paths',
     'version': '1.0',
-    'category': 'Warehouse Management',
+    'category': 'Manufacturing',
     'description': """
 This module supplements the Warehouse application by effectively implementing Push and Pull inventory flows.
 ============================================================================================================
diff --git a/addons/subscription/__openerp__.py b/addons/subscription/__openerp__.py
index d2010c47987..478c451b6ff 100644
--- a/addons/subscription/__openerp__.py
+++ b/addons/subscription/__openerp__.py
@@ -23,7 +23,7 @@
 {
     'name': 'Subscription and recurring operations',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Extra Tools',
     'description': """
 Create recurring documents.
 ===========================
diff --git a/addons/survey/__openerp__.py b/addons/survey/__openerp__.py
index 5a551c28a3d..f9caebd3575 100644
--- a/addons/survey/__openerp__.py
+++ b/addons/survey/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Survey Module',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Extra Tools',
     'description': """
 This module is used for surveying.
 ==================================
diff --git a/addons/thunderbird/__openerp__.py b/addons/thunderbird/__openerp__.py
index 51e4153e897..e7418cc9265 100644
--- a/addons/thunderbird/__openerp__.py
+++ b/addons/thunderbird/__openerp__.py
@@ -25,7 +25,7 @@
     "author" : ['OpenERP SA', 'Axelor'],
     "website" : "http://www.openerp.com/",
     "depends" : ["base","mail"],
-    "category" : "Tools",
+    "category" : "Customer Relationship Management",
     "description": """
 This module is required for the Thuderbird Plug-in to work properly.
 ====================================================================
diff --git a/addons/wiki/__openerp__.py b/addons/wiki/__openerp__.py
index cf2234b4386..40583faf9a0 100644
--- a/addons/wiki/__openerp__.py
+++ b/addons/wiki/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Document Management - Wiki',
     'version': '1.0.1',
-    'category': 'Tools',
+    'category': 'Knowledge Management',
     'complexity': "easy",
     'description': """
 The base module to manage documents(wiki).
diff --git a/addons/wiki_sale_faq/__openerp__.py b/addons/wiki_sale_faq/__openerp__.py
index 7d06dc73712..1df773a8c97 100644
--- a/addons/wiki_sale_faq/__openerp__.py
+++ b/addons/wiki_sale_faq/__openerp__.py
@@ -22,7 +22,7 @@
 {
     'name': 'Wiki - Sale-FAQ',
     'version': '1.0',
-    'category': 'Tools',
+    'category': 'Customer Relationship Management',
     'complexity': "easy",
     'description': """
 This module provides a Wiki Sales FAQ Template.