diff --git a/addons/account/__manifest__.py b/addons/account/__manifest__.py
index f7544acca7b..6a6c293e81b 100644
--- a/addons/account/__manifest__.py
+++ b/addons/account/__manifest__.py
@@ -12,7 +12,7 @@ The specific and easy-to-use Invoicing system in Odoo allows you to keep track o
 
 You could use this simplified accounting in case you work with an (external) account to keep your books, and you still want to keep track of payments. This module also offers you an easy method of registering payments, without having to encode complete abstracts of account.
     """,
-    'category': 'Accounting/Invoicing',
+    'category': 'Accounting/Accounting',
     'website': 'https://www.odoo.com/page/billing',
     'images' : ['images/accounts.jpeg','images/bank_statement.jpeg','images/cash_register.jpeg','images/chart_of_accounts.jpeg','images/customer_invoice.jpeg','images/journal_entries.jpeg'],
     'depends' : ['base_setup', 'product', 'analytic', 'portal', 'digest'],
diff --git a/addons/account/security/account_security.xml b/addons/account/security/account_security.xml
index bc20da1b775..e36c40d8b22 100644
--- a/addons/account/security/account_security.xml
+++ b/addons/account/security/account_security.xml
@@ -2,14 +2,14 @@
 <odoo>
 <data noupdate="0">
 
-    <record model="ir.module.category" id="base.module_category_accounting_invoicing">
+    <record model="ir.module.category" id="base.module_category_accounting_accounting">
         <field name="description">Helps you handle your accounting needs, if you are not an accountant, we suggest you to install only the Invoicing.</field>
         <field name="sequence">7</field>
     </record>
 
     <record id="group_account_invoice" model="res.groups">
         <field name="name">Billing</field>
-        <field name="category_id" ref="base.module_category_accounting_invoicing"/>
+        <field name="category_id" ref="base.module_category_accounting_accounting"/>
         <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
     </record>
 
@@ -32,7 +32,7 @@
 
     <record id="group_account_manager" model="res.groups">
         <field name="name">Billing Administrator</field>
-        <field name="category_id" ref="base.module_category_accounting_invoicing"/>
+        <field name="category_id" ref="base.module_category_accounting_accounting"/>
         <field name="implied_ids" eval="[(4, ref('group_account_invoice'))]"/>
     </record>
 
diff --git a/addons/account_analytic_default/__manifest__.py b/addons/account_analytic_default/__manifest__.py
index c165a27c7ba..b8f95eac36f 100644
--- a/addons/account_analytic_default/__manifest__.py
+++ b/addons/account_analytic_default/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Account Analytic Defaults',
     'version': '1.0',
-    'category': 'Accounting',
+    'category': 'Accounting/Accounting',
     'description': """
 Set default values for your analytic accounts.
 ==============================================
diff --git a/addons/account_analytic_default_hr_expense/__manifest__.py b/addons/account_analytic_default_hr_expense/__manifest__.py
index 4657ac3806d..400407bc25a 100644
--- a/addons/account_analytic_default_hr_expense/__manifest__.py
+++ b/addons/account_analytic_default_hr_expense/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Account Analytic Defaults for expenses.',
     'version': '1.0',
-    'category': 'Accounting',
+    'category': 'Accounting/Accounting',
     'description': """
 Set default values for your analytic accounts on your hr expenses.
 ==================================================================
diff --git a/addons/account_analytic_default_purchase/__manifest__.py b/addons/account_analytic_default_purchase/__manifest__.py
index e9546e6bfb4..274200dc2bd 100644
--- a/addons/account_analytic_default_purchase/__manifest__.py
+++ b/addons/account_analytic_default_purchase/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Account Analytic Defaults for Purchase.',
     'version': '1.0',
-    'category': 'Accounting',
+    'category': 'Accounting/Accounting',
     'description': """
 Set default values for your analytic accounts on your hr expenses.
 ==================================================================
diff --git a/addons/account_bank_statement_import/__manifest__.py b/addons/account_bank_statement_import/__manifest__.py
index 48b5c0acc6c..2990a427a49 100644
--- a/addons/account_bank_statement_import/__manifest__.py
+++ b/addons/account_bank_statement_import/__manifest__.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 {
     'name': 'Account Bank Statement Import',
-    'category': 'Accounting',
+    'category': 'Accounting/Accounting',
     'version': '1.0',
     'depends': ['account'],
     'description': """Generic Wizard to Import Bank Statements.
diff --git a/addons/account_check_printing/__manifest__.py b/addons/account_check_printing/__manifest__.py
index 52cb0a1d817..fbcd0bb7d39 100644
--- a/addons/account_check_printing/__manifest__.py
+++ b/addons/account_check_printing/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Check Printing Base',
     'version': '1.0',
-    'category': 'Accounting',
+    'category': 'Accounting/Accounting',
     'summary': 'Check printing commons',
     'description': """
 This module offers the basic functionalities to make payments by printing checks.
diff --git a/addons/account_facturx/__manifest__.py b/addons/account_facturx/__manifest__.py
index 49de3248eec..a580e617a4c 100644
--- a/addons/account_facturx/__manifest__.py
+++ b/addons/account_facturx/__manifest__.py
@@ -2,7 +2,7 @@
 {
     'name' : 'Import Bills/Invoices From XML',
     'version' : '1.0',
-    'category': 'Accounting',
+    'category': 'Accounting/Accounting',
     'depends' : ['account'],
     'data': [
         'data/facturx_templates.xml',
diff --git a/addons/account_lock/__manifest__.py b/addons/account_lock/__manifest__.py
index 67e76b49098..59ae0bd4db9 100644
--- a/addons/account_lock/__manifest__.py
+++ b/addons/account_lock/__manifest__.py
@@ -3,7 +3,7 @@
 {
     'name' : 'Irreversible Lock Date',
     'version' : '1.0',
-    'category': 'Accounting',
+    'category': 'Accounting/Accounting',
     'description': """
     Make the lock date irreversible:
 
diff --git a/addons/account_payment/__manifest__.py b/addons/account_payment/__manifest__.py
index 91f8c1cf137..791ab07ffb2 100644
--- a/addons/account_payment/__manifest__.py
+++ b/addons/account_payment/__manifest__.py
@@ -2,7 +2,7 @@
 
 {
     'name': 'Payment - Account',
-    'category': 'Accounting',
+    'category': 'Accounting/Accounting',
     'summary': 'Account and Payment Link and Portal',
     'version': '1.0',
     'description': """Link Account and Payment and add Portal Payment
diff --git a/addons/account_tax_python/__manifest__.py b/addons/account_tax_python/__manifest__.py
index 84807f85336..e27facde6aa 100644
--- a/addons/account_tax_python/__manifest__.py
+++ b/addons/account_tax_python/__manifest__.py
@@ -11,7 +11,7 @@ A tax defined as python code consists of two snippets of python code which are e
 
 "Python Code" defines the amount of the tax.
         """,
-    'category': 'Accounting',
+    'category': 'Accounting/Accounting',
     'version': '1.0',
     'depends': ['account'],
     'data': [
diff --git a/addons/account_test/__manifest__.py b/addons/account_test/__manifest__.py
index 4d037cbd116..c361378e6a2 100644
--- a/addons/account_test/__manifest__.py
+++ b/addons/account_test/__manifest__.py
@@ -7,7 +7,7 @@
 {
     'name': 'Accounting Consistency Tests',
     'version': '1.0',
-    'category': 'Accounting',
+    'category': 'Accounting/Accounting',
     'description': """
 Asserts on accounting.
 ======================
diff --git a/addons/analytic/__manifest__.py b/addons/analytic/__manifest__.py
index b19e4d280b7..9b832cfffdb 100644
--- a/addons/analytic/__manifest__.py
+++ b/addons/analytic/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name' : 'Analytic Accounting',
     'version': '1.1',
-    'category': 'Hidden/Dependency',
+    'category': 'Accounting/Accounting',
     'depends' : ['base', 'mail', 'uom'],
     'description': """
 Module for defining analytic accounting object.
diff --git a/addons/attachment_indexation/__manifest__.py b/addons/attachment_indexation/__manifest__.py
index 9c1cb4baf14..325590158e7 100644
--- a/addons/attachment_indexation/__manifest__.py
+++ b/addons/attachment_indexation/__manifest__.py
@@ -3,7 +3,7 @@
 {
     'name': 'Attachments List and Document Indexation',
     'version': '2.1',
-    'category': 'Document Management',
+    'category': 'Tools',
     'description': """
 Attachments list and document indexation
 ========================================
diff --git a/addons/auth_ldap/__manifest__.py b/addons/auth_ldap/__manifest__.py
index 97bad615a50..d70b6a54508 100644
--- a/addons/auth_ldap/__manifest__.py
+++ b/addons/auth_ldap/__manifest__.py
@@ -1,16 +1,16 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
 {
-    'name' : 'Authentication via LDAP',
-    'depends' : ['base', 'base_setup'],
+    'name': 'Authentication via LDAP',
+    'depends': ['base', 'base_setup'],
     #'description': < auto-loaded from README file
-    'category' : 'Extra Tools',
-    'data' : [
+    'category': 'Tools',
+    'data': [
         'views/ldap_installer_views.xml',
         'security/ir.model.access.csv',
         'views/res_config_settings_views.xml',
     ],
-    'external_dependencies' : {
-        'python' : ['pyldap'],
+    'external_dependencies': {
+        'python': ['pyldap'],
     }
 }
diff --git a/addons/auth_password_policy/__manifest__.py b/addons/auth_password_policy/__manifest__.py
index 34808609274..b2d59e56078 100644
--- a/addons/auth_password_policy/__manifest__.py
+++ b/addons/auth_password_policy/__manifest__.py
@@ -1,6 +1,7 @@
 {
     'name': "Password Policy",
     "summary": "Implement basic password policy configuration & check",
+    'category': 'Tools',
     'depends': ['base_setup', 'web'],
     'data': [
         'data/defaults.xml',
diff --git a/addons/auth_password_policy_signup/__manifest__.py b/addons/auth_password_policy_signup/__manifest__.py
index fa2b0699919..74314cc2e47 100644
--- a/addons/auth_password_policy_signup/__manifest__.py
+++ b/addons/auth_password_policy_signup/__manifest__.py
@@ -1,6 +1,7 @@
 {
     'name': "Password Policy support for Signup",
     'depends': ['auth_password_policy', 'auth_signup'],
+    'category': 'Tools',
     'auto_install': True,
     'data': [
         'views/assets.xml',
diff --git a/addons/auth_signup/__manifest__.py b/addons/auth_signup/__manifest__.py
index 81f6cbdb285..fe199521f85 100644
--- a/addons/auth_signup/__manifest__.py
+++ b/addons/auth_signup/__manifest__.py
@@ -8,7 +8,7 @@ Allow users to sign up and reset their password
 ===============================================
     """,
     'version': '1.0',
-    'category': 'Extra Tools',
+    'category': 'Tools',
     'auto_install': True,
     'depends': [
         'base_setup',
diff --git a/addons/barcodes/__manifest__.py b/addons/barcodes/__manifest__.py
index 4a1558a9994..f1f5e43a068 100644
--- a/addons/barcodes/__manifest__.py
+++ b/addons/barcodes/__manifest__.py
@@ -1,7 +1,7 @@
 {
     'name': 'Barcode',
     'version': '2.0',
-    'category': 'Extra Tools',
+    'category': 'Tools',
     'summary': 'Scan and Parse Barcodes',
     'depends': ['web'],
     'data': [
diff --git a/addons/base_address_city/__manifest__.py b/addons/base_address_city/__manifest__.py
index f472eb3680e..dbee4e8f975 100644
--- a/addons/base_address_city/__manifest__.py
+++ b/addons/base_address_city/__manifest__.py
@@ -4,7 +4,7 @@
     'name': 'City Addresses',
     'summary': 'Add a many2one field city on addresses',
     'sequence': '19',
-    'category': 'Base',
+    'category': 'Tools',
     'complexity': 'easy',
     'description': """
 City Management in Addresses
diff --git a/addons/base_address_extended/__manifest__.py b/addons/base_address_extended/__manifest__.py
index adb27e8bb90..a28394c756d 100644
--- a/addons/base_address_extended/__manifest__.py
+++ b/addons/base_address_extended/__manifest__.py
@@ -4,7 +4,7 @@
     'name': 'Extended Addresses',
     'summary': 'Add extra fields on addresses',
     'sequence': '19',
-    'category': 'Base',
+    'category': 'Hidden',
     'complexity': 'easy',
     'description': """
 Extended Addresses Management
diff --git a/addons/base_automation/__manifest__.py b/addons/base_automation/__manifest__.py
index 32a01918be8..94e911e6fe1 100644
--- a/addons/base_automation/__manifest__.py
+++ b/addons/base_automation/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Automated Action Rules',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Sales/Sales',
     'description': """
 This module allows to implement action rules for any object.
 ============================================================
diff --git a/addons/base_geolocalize/__manifest__.py b/addons/base_geolocalize/__manifest__.py
index a5ed52e1df3..1e2788eb772 100644
--- a/addons/base_geolocalize/__manifest__.py
+++ b/addons/base_geolocalize/__manifest__.py
@@ -3,7 +3,7 @@
 {
     'name': 'Partners Geolocation',
     'version': '2.1',
-    'category': 'Extra Tools',
+    'category': 'Tools',
     'description': """
 Partners Geolocation
 ========================
diff --git a/addons/base_iban/__manifest__.py b/addons/base_iban/__manifest__.py
index fa1ef403a17..2279e098f44 100644
--- a/addons/base_iban/__manifest__.py
+++ b/addons/base_iban/__manifest__.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'IBAN Bank Accounts',
-    'category': 'Extra Tools',
+    'category': 'Tools',
     'description': """
 This module installs the base for IBAN (International Bank Account Number) bank accounts and checks for it's validity.
 ======================================================================================================================
diff --git a/addons/base_import/__manifest__.py b/addons/base_import/__manifest__.py
index 891c6403f88..d88d5d1e450 100644
--- a/addons/base_import/__manifest__.py
+++ b/addons/base_import/__manifest__.py
@@ -22,7 +22,7 @@ Re-implement Odoo's file import system:
   need or want an online import can avoid it being available to users.
 """,
     'depends': ['web'],
-    'category': 'Extra Tools',
+    'category': 'Tools',
     'installable': True,
     'auto_install': True,
     'data': [
diff --git a/addons/base_import_module/__manifest__.py b/addons/base_import_module/__manifest__.py
index 69e7b5b2f9e..0504bcfd6b3 100644
--- a/addons/base_import_module/__manifest__.py
+++ b/addons/base_import_module/__manifest__.py
@@ -9,7 +9,7 @@ Import a custom data module
 This module allows authorized users to import a custom data module (.xml files and static assests)
 for customization purpose.
 """,
-    'category': 'Extra Tools',
+    'category': 'Tools',
     'depends': ['web'],
     'installable': True,
     'auto_install': False,
diff --git a/addons/base_import_module/tests/test_module/__manifest__.py b/addons/base_import_module/tests/test_module/__manifest__.py
index f28c854feee..6d958c3c1d5 100644
--- a/addons/base_import_module/tests/test_module/__manifest__.py
+++ b/addons/base_import_module/tests/test_module/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Test Module',
-    'category': 'Website',
+    'category': 'Website/Website',
     'summary': 'Custom',
     'version': '1.0',
     'description': """
diff --git a/addons/base_sparse_field/__manifest__.py b/addons/base_sparse_field/__manifest__.py
index ac5a5f6cc36..d98d9cb81a0 100644
--- a/addons/base_sparse_field/__manifest__.py
+++ b/addons/base_sparse_field/__manifest__.py
@@ -8,7 +8,7 @@
         limitation on the number of columns in a table. The values of all sparse
         fields are stored in a "serialized" field in the form of a JSON mapping.
     """,
-    'category': 'Technical Settings',
+    'category': 'Hidden',
     'version': '1.0',
     'depends': ['base'],
     'data': [
diff --git a/addons/base_vat/__manifest__.py b/addons/base_vat/__manifest__.py
index 5cd0e914eb2..7fa7202e4e6 100644
--- a/addons/base_vat/__manifest__.py
+++ b/addons/base_vat/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'VAT Number Validation',
     'version': '1.0',
-    'category': 'Accounting',
+    'category': 'Accounting/Accounting',
     'description': """
 VAT validation for Partner's VAT numbers.
 =========================================
diff --git a/addons/board/__manifest__.py b/addons/board/__manifest__.py
index 2be5ad88b53..7070055f299 100644
--- a/addons/board/__manifest__.py
+++ b/addons/board/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Dashboards',
     'version': '1.0',
-    'category': 'Extra Tools',
+    'category': 'Tools',
     'summary': 'Build your own dashboards',
     'description': """
 Lets the user create a custom dashboard.
diff --git a/addons/calendar/__manifest__.py b/addons/calendar/__manifest__.py
index 085194a2411..012af683dcc 100644
--- a/addons/calendar/__manifest__.py
+++ b/addons/calendar/__manifest__.py
@@ -18,7 +18,7 @@ It supports:
 
 If you need to manage your meetings, you should install the CRM module.
     """,
-    'category': 'Extra Tools',
+    'category': 'Tools',
     'demo': [
         'data/calendar_demo.xml'
     ],
diff --git a/addons/crm_iap_lead/__manifest__.py b/addons/crm_iap_lead/__manifest__.py
index a0faacf52df..86973093ac4 100644
--- a/addons/crm_iap_lead/__manifest__.py
+++ b/addons/crm_iap_lead/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Lead Generation',
     'summary': 'Create Leads/Opportunities based on country, industries, size, etc.',
-    'category': 'CRM',
+    'category': 'Sales/CRM',
     'depends': ['iap', 'crm'],
     'data': [
         'data/crm.iap.lead.industry.csv',
diff --git a/addons/crm_iap_lead_website/__manifest__.py b/addons/crm_iap_lead_website/__manifest__.py
index 8563e46a46c..13d3e1c0890 100644
--- a/addons/crm_iap_lead_website/__manifest__.py
+++ b/addons/crm_iap_lead_website/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Lead Generation From Website Visits',
     'summary': 'Create Leads/Opportunities from your website\'s traffic',
-    'category': 'CRM',
+    'category': 'Sales/CRM',
     'depends': ['iap', 'crm', 'website_form', 'crm_iap_lead'],
     'data': [
         'data/reveal_data.xml',
diff --git a/addons/crm_livechat/__manifest__.py b/addons/crm_livechat/__manifest__.py
index 1ff8aef366e..2b2a8477c8a 100644
--- a/addons/crm_livechat/__manifest__.py
+++ b/addons/crm_livechat/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'CRM Livechat',
-    'category': 'crm',
+    'category': 'Sales/CRM',
     'summary': 'Create lead from livechat conversation',
     'data': [
         'data/utm_data.xml',
diff --git a/addons/crm_sms/__manifest__.py b/addons/crm_sms/__manifest__.py
index cc3c7ab58b4..a32d0b718fe 100644
--- a/addons/crm_sms/__manifest__.py
+++ b/addons/crm_sms/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'SMS in CRM',
     'version': '1.0',
-    'category': 'Hidden',
+    'category': 'Sales/CRM',
     'summary': 'Add SMS capabilities to CRM',
     'description': "",
     'depends': ['crm', 'sms'],
diff --git a/addons/delivery/__manifest__.py b/addons/delivery/__manifest__.py
index 71e51c28708..6c523da2008 100644
--- a/addons/delivery/__manifest__.py
+++ b/addons/delivery/__manifest__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Delivery Costs',
     'version': '1.0',
-    'category': 'Stock',
+    'category': 'Operations/Inventory/Delivery',
     'description': """
 Allows you to add delivery methods in sale orders and picking.
 ==============================================================
diff --git a/addons/event_sale/__manifest__.py b/addons/event_sale/__manifest__.py
index 5ad00204e04..b46b9f091f4 100644
--- a/addons/event_sale/__manifest__.py
+++ b/addons/event_sale/__manifest__.py
@@ -3,7 +3,7 @@
 {
     'name': 'Events Sales',
     'version': '1.1',
-    'category': 'Marketing',
+    'category': 'Marketing/Events',
     'website': 'https://www.odoo.com/page/events',
     'description': """
 Creating registration with sales orders.
diff --git a/addons/event_sms/__manifest__.py b/addons/event_sms/__manifest__.py
index 697f0e71876..756ade6c0e3 100644
--- a/addons/event_sms/__manifest__.py
+++ b/addons/event_sms/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'SMS on Events',
     'version': '1.0',
-    'category': 'Marketing',
+    'category': 'Marketing/Events',
     'description': """Schedule SMS in event management""",
     'depends': ['event', 'sms'],
     'data': [
diff --git a/addons/fetchmail/__manifest__.py b/addons/fetchmail/__manifest__.py
index c9d270a5771..6f96aa3c5e3 100644
--- a/addons/fetchmail/__manifest__.py
+++ b/addons/fetchmail/__manifest__.py
@@ -5,7 +5,7 @@
     'name': 'Email Gateway',
     'version': '1.0',
     'depends': ['mail'],
-    'category': 'Extra Tools',
+    'category': 'Tools',
     'description': """
 Retrieve incoming email on POP/IMAP servers.
 ============================================
diff --git a/addons/gamification_sale_crm/__manifest__.py b/addons/gamification_sale_crm/__manifest__.py
index 0b1c4518958..b1ea6ef7b53 100644
--- a/addons/gamification_sale_crm/__manifest__.py
+++ b/addons/gamification_sale_crm/__manifest__.py
@@ -3,7 +3,7 @@
 {
     'name': 'CRM Gamification',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Sales/CRM',
     'depends': ['gamification', 'sale_crm'],
     'description': """Example of goal definitions and challenges that can be used related to the usage of the CRM Sale module.""",
     'data': ['data/gamification_sale_crm_data.xml'],
diff --git a/addons/google_account/__manifest__.py b/addons/google_account/__manifest__.py
index 02109b70ac6..8aae3b023cc 100644
--- a/addons/google_account/__manifest__.py
+++ b/addons/google_account/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Google Users',
-    'category': 'Extra Tools',
+    'category': 'Tools',
     'description': """
 The module adds google user in res user.
 ========================================
diff --git a/addons/google_calendar/__manifest__.py b/addons/google_calendar/__manifest__.py
index 34d058bd202..e506ee1781c 100644
--- a/addons/google_calendar/__manifest__.py
+++ b/addons/google_calendar/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Google Calendar',
     'version': '1.0',
-    'category': 'Extra Tools',
+    'category': 'Tools',
     'description': "",
     'depends': ['google_account', 'calendar'],
     'qweb': ['static/src/xml/*.xml'],
diff --git a/addons/google_drive/__manifest__.py b/addons/google_drive/__manifest__.py
index 090dff99f73..d12c72ec6ef 100644
--- a/addons/google_drive/__manifest__.py
+++ b/addons/google_drive/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Google Drive™ integration',
     'version': '0.2',
-    'category': 'Extra Tools',
+    'category': 'Tools',
     'installable': True,
     'auto_install': False,
     'data': [
diff --git a/addons/google_spreadsheet/__manifest__.py b/addons/google_spreadsheet/__manifest__.py
index 26c2e3660ce..86a3edbcfea 100644
--- a/addons/google_spreadsheet/__manifest__.py
+++ b/addons/google_spreadsheet/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Google Spreadsheet',
     'version': '1.0',
-    'category': 'Extra Tools',
+    'category': 'Tools',
     'description': """
 The module adds the possibility to display data from Odoo in Google Spreadsheets in real time.
 =================================================================================================
diff --git a/addons/hr_expense_check/__manifest__.py b/addons/hr_expense_check/__manifest__.py
index 8fe469b5900..de9fac9fdb9 100644
--- a/addons/hr_expense_check/__manifest__.py
+++ b/addons/hr_expense_check/__manifest__.py
@@ -2,7 +2,7 @@
 {
     'name': "Check Printing in Expenses",
     'summary': """Print amount in words on checks issued for expenses""",
-    'category': 'Accounting',
+    'category': 'Accounting/Expenses',
     'description': """
         Print amount in words on checks issued for expenses
     """,
diff --git a/addons/hr_holidays_attendance/__manifest__.py b/addons/hr_holidays_attendance/__manifest__.py
index 8c6ad55f30d..322a6081147 100644
--- a/addons/hr_holidays_attendance/__manifest__.py
+++ b/addons/hr_holidays_attendance/__manifest__.py
@@ -2,7 +2,7 @@
 {
     'name': "HR Attendance Holidays",
     'summary': """""",
-    'category': 'HR',
+    'category': 'Human Resources',
     'description': """
 Hides the attendance presence button when an employee is on leave.
     """,
diff --git a/addons/hr_maintenance/__manifest__.py b/addons/hr_maintenance/__manifest__.py
index cc334b32d7b..258dba89a14 100644
--- a/addons/hr_maintenance/__manifest__.py
+++ b/addons/hr_maintenance/__manifest__.py
@@ -4,6 +4,7 @@
     'name': 'Maintenance - HR',
     'version': '1.0',
     'sequence': 125,
+    'category': 'Human Resources',
     'description': """
         Bridge between HR and Maintenance.""",
     'depends': ['hr', 'maintenance'],
diff --git a/addons/hr_recruitment_survey/__manifest__.py b/addons/hr_recruitment_survey/__manifest__.py
index 6d04b788b10..38a986dde72 100644
--- a/addons/hr_recruitment_survey/__manifest__.py
+++ b/addons/hr_recruitment_survey/__manifest__.py
@@ -2,7 +2,7 @@
 {
     'name': "Hr Recruitment Interview Forms",
     'version': '1.0',
-    'category': 'Human Resources Survey',
+    'category': 'Human Resources',
     'summary': 'Surveys',
     'description': """
         Use interview forms during recruitment process.
diff --git a/addons/hw_blackbox_be/__manifest__.py b/addons/hw_blackbox_be/__manifest__.py
index a88789d5299..32ecb1285c0 100644
--- a/addons/hw_blackbox_be/__manifest__.py
+++ b/addons/hw_blackbox_be/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Blackbox Hardware Driver',
-    'category': 'Point of Sale',
+    'category': 'Sales/Point Of Sale',
     'sequence': 6,
     'summary': 'Hardware Driver for Belgian Fiscal Data Modules',
     'website': 'https://www.odoo.com/page/point-of-sale-hardware',
diff --git a/addons/hw_drivers/__manifest__.py b/addons/hw_drivers/__manifest__.py
index c1955ee6d74..0575ccffcbd 100644
--- a/addons/hw_drivers/__manifest__.py
+++ b/addons/hw_drivers/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Hardware Proxy',
-    'category': 'IOT',
+    'category': 'Hidden',
     'sequence': 6,
     'summary': 'Connect the Web Client to Hardware Peripherals',
     'website': 'https://www.odoo.com/page/iot',
@@ -14,7 +14,7 @@ Hardware Poxy
 This module allows you to remotely use peripherals connected to this server.
 
 This modules only contains the enabling framework. The actual devices drivers
-are found in other modules that must be installed separately. 
+are found in other modules that must be installed separately.
 
 """,
     'installable': False,
diff --git a/addons/hw_escpos/__manifest__.py b/addons/hw_escpos/__manifest__.py
index b458ff33031..25e9885c1a3 100644
--- a/addons/hw_escpos/__manifest__.py
+++ b/addons/hw_escpos/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'ESC/POS Hardware Driver',
-    'category': 'Point of Sale',
+    'category': 'Sales/Point Of Sale',
     'sequence': 6,
     'website': 'https://www.odoo.com/page/point-of-sale-hardware',
     'summary': 'Hardware Driver for ESC/POS Printers and Cashdrawers',
diff --git a/addons/hw_posbox_homepage/__manifest__.py b/addons/hw_posbox_homepage/__manifest__.py
index 857c0d2dc61..17010c08b0a 100644
--- a/addons/hw_posbox_homepage/__manifest__.py
+++ b/addons/hw_posbox_homepage/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'IoT Box Homepage',
-    'category': 'Point of Sale',
+    'category': 'Sales/Point Of Sale',
     'sequence': 6,
     'website': 'https://www.odoo.com/page/point-of-sale-hardware',
     'summary': 'A homepage for the IoT Box',
diff --git a/addons/hw_posbox_upgrade/__manifest__.py b/addons/hw_posbox_upgrade/__manifest__.py
index fd0f017b221..eb3ee53ed14 100644
--- a/addons/hw_posbox_upgrade/__manifest__.py
+++ b/addons/hw_posbox_upgrade/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'IoTBox Software Upgrader',
-    'category': 'Point of Sale',
+    'category': 'Sales/Point Of Sale',
     'website': 'https://www.odoo.com/page/point-of-sale-hardware',
     'sequence': 6,
     'summary': 'Remotely upgrade the IoTBox software',
diff --git a/addons/hw_proxy/__manifest__.py b/addons/hw_proxy/__manifest__.py
index a79ea6501a1..6356d1fea8b 100644
--- a/addons/hw_proxy/__manifest__.py
+++ b/addons/hw_proxy/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Hardware Proxy',
-    'category': 'Point Of Sale',
+    'category': 'Sales/Point Of Sale',
     'sequence': 6,
     'summary': 'Connect the Web Client to Hardware Peripherals',
     'website': 'https://www.odoo.com/page/point-of-sale-hardware',
diff --git a/addons/l10n_be_invoice_bba/__manifest__.py b/addons/l10n_be_invoice_bba/__manifest__.py
index 229b60b4293..0fd920324be 100644
--- a/addons/l10n_be_invoice_bba/__manifest__.py
+++ b/addons/l10n_be_invoice_bba/__manifest__.py
@@ -7,7 +7,7 @@
     'name': 'Belgium - Structured Communication',
     'version': '1.2',
     'author': 'Noviat',
-    'category': 'Invoicing Management',
+    'category': 'Accounting/Accounting',
     'description': """
 
 Add Structured Communication to customer invoices.
diff --git a/addons/l10n_fr_fec/__manifest__.py b/addons/l10n_fr_fec/__manifest__.py
index c1a31eb1066..04ffd69c3c9 100644
--- a/addons/l10n_fr_fec/__manifest__.py
+++ b/addons/l10n_fr_fec/__manifest__.py
@@ -5,7 +5,7 @@
 
 {
     'name': 'France - FEC',
-    'category': 'Accounting',
+    'category': 'Accounting/Accounting',
     'summary': "Fichier d'Échange Informatisé (FEC) for France",
     'author': "Akretion,Odoo Community Association (OCA)",
     'depends': ['l10n_fr', 'account'],
diff --git a/addons/l10n_fr_pos_cert/__manifest__.py b/addons/l10n_fr_pos_cert/__manifest__.py
index 6e20a3cba7d..d77b39faf5f 100644
--- a/addons/l10n_fr_pos_cert/__manifest__.py
+++ b/addons/l10n_fr_pos_cert/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'France - VAT Anti-Fraud Certification for Point of Sale (CGI 286 I-3 bis)',
     'version': '1.0',
-    'category': 'Accounting',
+    'category': 'Accounting/Accounting',
     'description': """
 This add-on brings the technical requirements of the French regulation CGI art. 286, I. 3° bis that stipulates certain criteria concerning the inalterability, security, storage and archiving of data related to sales to private individuals (B2C).
 -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
diff --git a/addons/l10n_in_purchase/__manifest__.py b/addons/l10n_in_purchase/__manifest__.py
index b91f7d7e843..0d6e75058d9 100644
--- a/addons/l10n_in_purchase/__manifest__.py
+++ b/addons/l10n_in_purchase/__manifest__.py
@@ -5,7 +5,7 @@
     'name': 'Indian - Purchase Report(GST)',
     'version': '1.0',
     'description': """GST Purchase Report""",
-    'category': 'Accounting',
+    'category': 'Accounting/Accounting',
     'depends': [
         'l10n_in',
         'purchase',
diff --git a/addons/l10n_in_sale/__manifest__.py b/addons/l10n_in_sale/__manifest__.py
index 381578765fc..4a8e07f6f7a 100644
--- a/addons/l10n_in_sale/__manifest__.py
+++ b/addons/l10n_in_sale/__manifest__.py
@@ -5,7 +5,7 @@
     'name': 'Indian - Sale Report(GST)',
     'version': '1.0',
     'description': """GST Sale Report""",
-    'category': 'Accounting',
+    'category': 'Accounting/Accounting',
     'depends': [
         'l10n_in',
         'sale',
diff --git a/addons/l10n_in_stock/__manifest__.py b/addons/l10n_in_stock/__manifest__.py
index 84a35e391b5..65c83303001 100644
--- a/addons/l10n_in_stock/__manifest__.py
+++ b/addons/l10n_in_stock/__manifest__.py
@@ -5,7 +5,7 @@
     'name': 'Indian - Stock Report(GST)',
     'version': '1.0',
     'description': """GST Stock Report""",
-    'category': 'Accounting',
+    'category': 'Accounting/Accounting',
     'depends': [
         'l10n_in',
         'stock',
diff --git a/addons/maintenance/__manifest__.py b/addons/maintenance/__manifest__.py
index 03e937f0885..3dea03098d3 100644
--- a/addons/maintenance/__manifest__.py
+++ b/addons/maintenance/__manifest__.py
@@ -4,7 +4,7 @@
     'name': 'Maintenance',
     'version': '1.0',
     'sequence': 125,
-    'category': 'Human Resources/Maintenance',
+    'category': 'Operations/Maintenance',
     'description': """
         Track equipments and maintenance requests""",
     'depends': ['mail'],
diff --git a/addons/maintenance/security/maintenance.xml b/addons/maintenance/security/maintenance.xml
index 047c5c9ef45..89340fed747 100644
--- a/addons/maintenance/security/maintenance.xml
+++ b/addons/maintenance/security/maintenance.xml
@@ -3,7 +3,7 @@
     <!-- This group is only allowed to deal with equipment registration and maintenance -->
     <record id="group_equipment_manager" model="res.groups">
         <field name="name">Equipment Manager</field>
-        <field name="category_id" ref="base.module_category_human_resources_maintenance"/>
+        <field name="category_id" ref="base.module_category_operations_maintenance"/>
         <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
         <field name="comment">The user will be able to manage equipments.</field>
     </record>
diff --git a/addons/membership/__manifest__.py b/addons/membership/__manifest__.py
index 2a2ffd49576..d2d4ad1f6bd 100644
--- a/addons/membership/__manifest__.py
+++ b/addons/membership/__manifest__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Members',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Sales/Sales',
     'description': """
 This module allows you to manage all operations for managing memberships.
 =========================================================================
diff --git a/addons/mrp_account/__manifest__.py b/addons/mrp_account/__manifest__.py
index 3203525413e..29dc54e3afb 100644
--- a/addons/mrp_account/__manifest__.py
+++ b/addons/mrp_account/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Accounting - MRP',
     'version': '1.0',
-    'category': 'Manufacturing',
+    'category': 'Manufacturing/Manufacturing',
     'summary': 'Analytic accounting in Manufacturing',
     'description': """
 Analytic Accounting in MRP
diff --git a/addons/mrp_subcontracting_dropshipping/__manifest__.py b/addons/mrp_subcontracting_dropshipping/__manifest__.py
index 6d69eb4afe5..8412093dd64 100644
--- a/addons/mrp_subcontracting_dropshipping/__manifest__.py
+++ b/addons/mrp_subcontracting_dropshipping/__manifest__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Dropship and Subcontracting Management',
     'version': '0.1',
-    'category': 'Hidden',
+    'category': 'Operations/Purchase',
     'description': """
         This bridge module allows to manage subcontracting with the dropshipping module.
     """,
diff --git a/addons/pad/__manifest__.py b/addons/pad/__manifest__.py
index 2ef0a1dccdc..fa20f10b269 100644
--- a/addons/pad/__manifest__.py
+++ b/addons/pad/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Collaborative Pads',
     'version': '2.0',
-    'category': 'Extra Tools',
+    'category': 'Tools',
     'description': """
 Adds enhanced support for (Ether)Pad attachments in the web client.
 ===================================================================
diff --git a/addons/pad_project/__manifest__.py b/addons/pad_project/__manifest__.py
index 3707cfa3abf..bc5b646a639 100644
--- a/addons/pad_project/__manifest__.py
+++ b/addons/pad_project/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Pad on tasks',
-    'category': 'Project',
+    'category': 'Operations/Project',
     'description': """
 This module adds a PAD in all project form views.
 =================================================
diff --git a/addons/payment/__manifest__.py b/addons/payment/__manifest__.py
index 0bc6c8fe583..ed34d0a3768 100644
--- a/addons/payment/__manifest__.py
+++ b/addons/payment/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Payment Acquirer',
-    'category': 'Accounting',
+    'category': 'Hidden',
     'summary': 'Base Module for Payment Acquirers',
     'version': '1.0',
     'description': """Payment Acquirer Base Module""",
diff --git a/addons/payment_adyen/__manifest__.py b/addons/payment_adyen/__manifest__.py
index 8b04a9834e2..0f5254a64c1 100644
--- a/addons/payment_adyen/__manifest__.py
+++ b/addons/payment_adyen/__manifest__.py
@@ -2,7 +2,7 @@
 
 {
     'name': 'Adyen Payment Acquirer',
-    'category': 'Accounting',
+    'category': 'Accounting/Payment',
     'summary': 'Payment Acquirer: Adyen Implementation',
     'version': '1.0',
     'description': """Adyen Payment Acquirer""",
diff --git a/addons/payment_alipay/__manifest__.py b/addons/payment_alipay/__manifest__.py
index 140f9df6aa5..93e5debe871 100644
--- a/addons/payment_alipay/__manifest__.py
+++ b/addons/payment_alipay/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Alipay Payment Acquirer',
-    'category': 'Accounting',
+    'category': 'Accounting/Payment',
     'summary': 'Payment Acquirer: Alipay Implementation',
     'description': """Alipay Payment Acquirer""",
     'depends': ['payment'],
diff --git a/addons/payment_authorize/__manifest__.py b/addons/payment_authorize/__manifest__.py
index af6c1e946b9..d49849e08a1 100644
--- a/addons/payment_authorize/__manifest__.py
+++ b/addons/payment_authorize/__manifest__.py
@@ -2,7 +2,7 @@
 
 {
     'name': 'Authorize.Net Payment Acquirer',
-    'category': 'Accounting',
+    'category': 'Accounting/Payment',
     'summary': 'Payment Acquirer: Authorize.net Implementation',
     'version': '1.0',
     'description': """Authorize.Net Payment Acquirer""",
diff --git a/addons/payment_buckaroo/__manifest__.py b/addons/payment_buckaroo/__manifest__.py
index f08e9152473..6243d0a5d11 100644
--- a/addons/payment_buckaroo/__manifest__.py
+++ b/addons/payment_buckaroo/__manifest__.py
@@ -2,7 +2,7 @@
 
 {
     'name': 'Buckaroo Payment Acquirer',
-    'category': 'Accounting',
+    'category': 'Accounting/Payment',
     'summary': 'Payment Acquirer: Buckaroo Implementation',
     'version': '1.0',
     'description': """Buckaroo Payment Acquirer""",
diff --git a/addons/payment_ingenico/__manifest__.py b/addons/payment_ingenico/__manifest__.py
index 229fade5550..ed95decbd93 100644
--- a/addons/payment_ingenico/__manifest__.py
+++ b/addons/payment_ingenico/__manifest__.py
@@ -2,7 +2,7 @@
 
 {
     'name': 'Ingenico Payment Acquirer',
-    'category': 'Accounting',
+    'category': 'Accounting/Payment',
     'summary': 'Payment Acquirer: Ingenico Implementation',
     'version': '1.0',
     'description': """Ingenico Payment Acquirer""",
diff --git a/addons/payment_paypal/__manifest__.py b/addons/payment_paypal/__manifest__.py
index a16c214dcb4..75a6b9180ca 100644
--- a/addons/payment_paypal/__manifest__.py
+++ b/addons/payment_paypal/__manifest__.py
@@ -2,7 +2,7 @@
 
 {
     'name': 'Paypal Payment Acquirer',
-    'category': 'Accounting',
+    'category': 'Accounting/Payment',
     'summary': 'Payment Acquirer: Paypal Implementation',
     'version': '1.0',
     'description': """Paypal Payment Acquirer""",
diff --git a/addons/payment_payulatam/__manifest__.py b/addons/payment_payulatam/__manifest__.py
index 3cb48a950ea..bbb55c47280 100644
--- a/addons/payment_payulatam/__manifest__.py
+++ b/addons/payment_payulatam/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'PayuLatam Payment Acquirer',
-    'category': 'Payment Acquirer',
+    'category': 'Accounting/Payment',
     'summary': 'Payment Acquirer: PayuLatam Implementation',
     'description': """Payulatam payment acquirer""",
     'depends': ['payment'],
diff --git a/addons/payment_payumoney/__manifest__.py b/addons/payment_payumoney/__manifest__.py
index 66f83456fcb..5c1e2c7e2b6 100644
--- a/addons/payment_payumoney/__manifest__.py
+++ b/addons/payment_payumoney/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'PayuMoney Payment Acquirer',
-    'category': 'Payment Acquirer',
+    'category': 'Accounting/Payment',
     'summary': 'Payment Acquirer: PayuMoney Implementation',
     'description': """
     PayuMoney Payment Acquirer for India.
diff --git a/addons/payment_sips/__manifest__.py b/addons/payment_sips/__manifest__.py
index 2764807c5ea..dd2abb37ecc 100644
--- a/addons/payment_sips/__manifest__.py
+++ b/addons/payment_sips/__manifest__.py
@@ -7,7 +7,7 @@
     'name': 'Worldline SIPS',
     'version': '1.0',
     'author': 'Eezee-It',
-    'category': 'Accounting',
+    'category': 'Accounting/Payment',
     'description': """
 Worldline SIPS Payment Acquirer for online payments
 
diff --git a/addons/payment_stripe/__manifest__.py b/addons/payment_stripe/__manifest__.py
index 247fe74859b..85586ef94e9 100644
--- a/addons/payment_stripe/__manifest__.py
+++ b/addons/payment_stripe/__manifest__.py
@@ -2,7 +2,7 @@
 
 {
     'name': 'Stripe Payment Acquirer',
-    'category': 'Hidden',
+    'category': 'Accounting/Payment',
     'summary': 'Payment Acquirer: Stripe Implementation',
     'version': '1.0',
     'description': """Stripe Payment Acquirer""",
diff --git a/addons/payment_transfer/__manifest__.py b/addons/payment_transfer/__manifest__.py
index 530fe49ede4..c1130c120b1 100644
--- a/addons/payment_transfer/__manifest__.py
+++ b/addons/payment_transfer/__manifest__.py
@@ -2,7 +2,7 @@
 
 {
     'name': 'Transfer Payment Acquirer',
-    'category': 'Accounting',
+    'category': 'Accounting/Payment',
     'summary': 'Payment Acquirer: Transfer Implementation',
     'version': '1.0',
     'description': """Transfer Payment Acquirer""",
diff --git a/addons/pos_adyen/__manifest__.py b/addons/pos_adyen/__manifest__.py
index e79fb5ca105..6636a241a18 100644
--- a/addons/pos_adyen/__manifest__.py
+++ b/addons/pos_adyen/__manifest__.py
@@ -3,7 +3,7 @@
 {
     'name': 'POS Adyen',
     'version': '1.0',
-    'category': 'Point of Sale',
+    'category': 'Sales/Point Of Sale',
     'sequence': 6,
     'summary': 'Integrate your POS with an Adyen payment terminal',
     'description': '',
diff --git a/addons/pos_cache/__manifest__.py b/addons/pos_cache/__manifest__.py
index 648470abd57..32863010dc8 100644
--- a/addons/pos_cache/__manifest__.py
+++ b/addons/pos_cache/__manifest__.py
@@ -10,7 +10,7 @@ This creates a product cache per POS config. It drastically lowers the
 time it takes to load a POS session with a lot of products.
     """,
 
-    'category': 'Point Of Sale',
+    'category': 'Sales/Point Of Sale',
     'version': '1.0',
     'depends': ['point_of_sale'],
     'data': [
diff --git a/addons/pos_discount/__manifest__.py b/addons/pos_discount/__manifest__.py
index 0fc55c5f22b..93e95178f4b 100644
--- a/addons/pos_discount/__manifest__.py
+++ b/addons/pos_discount/__manifest__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Point of Sale Discounts',
     'version': '1.0',
-    'category': 'Point of Sale',
+    'category': 'Sales/Point Of Sale',
     'sequence': 6,
     'summary': 'Simple Discounts in the Point of Sale ',
     'description': """
diff --git a/addons/pos_epson_printer/__manifest__.py b/addons/pos_epson_printer/__manifest__.py
index 9aaf5cbd24e..66702a9fcc9 100644
--- a/addons/pos_epson_printer/__manifest__.py
+++ b/addons/pos_epson_printer/__manifest__.py
@@ -5,7 +5,7 @@
 {
     'name': 'pos_epson_printer',
     'version': '1.0',
-    'category': 'Point of Sale',
+    'category': 'Sales/Point Of Sale',
     'sequence': 6,
     'summary': 'Epson ePOS Printers in PoS',
     'description': """
diff --git a/addons/pos_epson_printer_restaurant/__manifest__.py b/addons/pos_epson_printer_restaurant/__manifest__.py
index af17e5ae176..3204b9b88a4 100644
--- a/addons/pos_epson_printer_restaurant/__manifest__.py
+++ b/addons/pos_epson_printer_restaurant/__manifest__.py
@@ -5,7 +5,7 @@
 {
     'name': 'pos_epson_printer_restaurant',
     'version': '1.0',
-    'category': 'Point of Sale',
+    'category': 'Sales/Point Of Sale',
     'sequence': 6,
     'summary': 'Epson Printers as Order Printers',
     'description': """
diff --git a/addons/pos_mercury/__manifest__.py b/addons/pos_mercury/__manifest__.py
index 773f5e933b3..2646f909636 100644
--- a/addons/pos_mercury/__manifest__.py
+++ b/addons/pos_mercury/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Vantiv Payment Services',
     'version': '1.0',
-    'category': 'Point of Sale',
+    'category': 'Sales/Point Of Sale',
     'sequence': 6,
     'summary': 'Credit card support for Point Of Sale',
     'description': """
diff --git a/addons/pos_reprint/__manifest__.py b/addons/pos_reprint/__manifest__.py
index 8e816b3e329..e5dfe36695f 100644
--- a/addons/pos_reprint/__manifest__.py
+++ b/addons/pos_reprint/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Point of Sale Receipt Reprinting',
     'version': '1.0',
-    'category': 'Point of Sale',
+    'category': 'Sales/Point Of Sale',
     'sequence': 6,
     'summary': 'Allow cashier to reprint receipts',
     'description': """
diff --git a/addons/pos_restaurant/__manifest__.py b/addons/pos_restaurant/__manifest__.py
index bd16f357c06..22715fbee73 100644
--- a/addons/pos_restaurant/__manifest__.py
+++ b/addons/pos_restaurant/__manifest__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Restaurant',
     'version': '1.0',
-    'category': 'Point of Sale',
+    'category': 'Sales/Point Of Sale',
     'sequence': 6,
     'summary': 'Restaurant extensions for the Point of Sale ',
     'description': """
diff --git a/addons/procurement_jit/__manifest__.py b/addons/procurement_jit/__manifest__.py
index 45f1a27b630..819b87af2c5 100644
--- a/addons/procurement_jit/__manifest__.py
+++ b/addons/procurement_jit/__manifest__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Just In Time Scheduling',
     'version': '1.0',
-    'category': 'Warehouse',
+    'category': 'Operations/Inventory',
     'description': """
 This module will automatically reserve the picking from stock when a sales order is confirmed
 =============================================================================================
diff --git a/addons/product/__manifest__.py b/addons/product/__manifest__.py
index 4e4e38ac311..3f595f62a78 100644
--- a/addons/product/__manifest__.py
+++ b/addons/product/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Products & Pricelists',
     'version': '1.2',
-    'category': 'Sales',
+    'category': 'Sales/Sales',
     'depends': ['base', 'mail', 'uom'],
     'description': """
 This is the base module for managing products and pricelists in Odoo.
diff --git a/addons/product_email_template/__manifest__.py b/addons/product_email_template/__manifest__.py
index b60cbecc99f..7d421f828e2 100644
--- a/addons/product_email_template/__manifest__.py
+++ b/addons/product_email_template/__manifest__.py
@@ -3,7 +3,7 @@
 {
     'name': 'Product Email Template',
     'depends': ['account'],
-    'category': 'Accounting',
+    'category': 'Accounting/Accounting',
     'description': """
 Add email templates to products to be sent on invoice confirmation
 ==================================================================
diff --git a/addons/product_expiry/__manifest__.py b/addons/product_expiry/__manifest__.py
index d3c61fb0495..000f3d5b2a5 100644
--- a/addons/product_expiry/__manifest__.py
+++ b/addons/product_expiry/__manifest__.py
@@ -1,9 +1,9 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
-    'name' : 'Products Expiration Date',
-    'category' : 'Warehouse',
-    'depends' : ['stock'],
-    'demo' : [],
+    'name': 'Products Expiration Date',
+    'category': 'Operations/Inventory',
+    'depends': ['stock'],
+    'demo': [],
     'description': """
 Track different dates on products and production lots.
 ======================================================
diff --git a/addons/product_margin/__manifest__.py b/addons/product_margin/__manifest__.py
index 3b7ac65d638..af9c7536f3a 100644
--- a/addons/product_margin/__manifest__.py
+++ b/addons/product_margin/__manifest__.py
@@ -4,7 +4,7 @@
 
 {
     'name': 'Margins by Products',
-    'category': 'Sales',
+    'category': 'Sales/Sales',
     'description': """
 Adds a reporting menu in products that computes sales, purchases, margins and other interesting indicators based on invoices.
 =============================================================================================================================
diff --git a/addons/product_matrix/__manifest__.py b/addons/product_matrix/__manifest__.py
index e1e009d8482..ae4d3cdefb3 100644
--- a/addons/product_matrix/__manifest__.py
+++ b/addons/product_matrix/__manifest__.py
@@ -8,7 +8,7 @@
     'description': """
 Please refer to Sale Matrix or Purchase Matrix for the use of this module.
     """,
-    'category': 'Sales',
+    'category': 'Sales/Sales',
     'version': '1.0',
     'depends': ['account'],
     # Account dependency for section_and_note widget.
diff --git a/addons/purchase_mrp/__manifest__.py b/addons/purchase_mrp/__manifest__.py
index 26842162b95..e6543330a38 100644
--- a/addons/purchase_mrp/__manifest__.py
+++ b/addons/purchase_mrp/__manifest__.py
@@ -5,7 +5,7 @@
 {
     'name': 'Purchase and MRP Management',
     'version': '1.0',
-    'category': 'Hidden',
+    'category': 'Operations/Purchase',
     'description': """
 This module provides facility to the user to install mrp and purchase modules at a time.
 ========================================================================================
diff --git a/addons/purchase_product_matrix/__manifest__.py b/addons/purchase_product_matrix/__manifest__.py
index bce683a04b8..9a2c009b6d8 100644
--- a/addons/purchase_product_matrix/__manifest__.py
+++ b/addons/purchase_product_matrix/__manifest__.py
@@ -9,7 +9,7 @@
         This module allows to fill Purchase Orders rapidly
         by choosing product variants quantity through a Grid Entry.
     """,
-    'category': 'Purchase',
+    'category': 'Operations/Purchase',
     'version': '1.0',
     'depends': ['purchase', 'product_matrix'],
     'data': [
diff --git a/addons/purchase_requisition/__manifest__.py b/addons/purchase_requisition/__manifest__.py
index 5c2ca1a77c9..a1f8d925848 100644
--- a/addons/purchase_requisition/__manifest__.py
+++ b/addons/purchase_requisition/__manifest__.py
@@ -2,7 +2,7 @@
 {
     'name': 'Purchase Agreements',
     'version': '0.1',
-    'category': 'Purchase',
+    'category': 'Operations/Purchase',
     'description': """
 This module allows you to manage your Purchase Agreements.
 ===========================================================
diff --git a/addons/purchase_requisition_stock/__manifest__.py b/addons/purchase_requisition_stock/__manifest__.py
index 86cceb302b9..860fa190cff 100644
--- a/addons/purchase_requisition_stock/__manifest__.py
+++ b/addons/purchase_requisition_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Purchase Requisition Stock',
     'version': '1.2',
-    'category': 'Purchases',
+    'category': 'Operations/Purchase',
     'sequence': 70,
     'summary': '',
     'description': "",
diff --git a/addons/purchase_stock/__manifest__.py b/addons/purchase_stock/__manifest__.py
index 6a5b1fcecd3..118481fa98b 100644
--- a/addons/purchase_stock/__manifest__.py
+++ b/addons/purchase_stock/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Purchase Stock',
     'version': '1.2',
-    'category': 'Purchase',
+    'category': 'Operations/Purchase',
     'sequence': 60,
     'summary': 'Purchase Orders, Receipts, Vendor Bills for Stock',
     'description': "",
diff --git a/addons/repair/__manifest__.py b/addons/repair/__manifest__.py
index c81cb79883a..630dbc298b0 100644
--- a/addons/repair/__manifest__.py
+++ b/addons/repair/__manifest__.py
@@ -6,7 +6,7 @@
     'name': 'Repairs',
     'version': '1.0',
     'sequence': 200,
-    'category': 'Manufacturing',
+    'category': 'Manufacturing/Manufacturing',
     'summary': 'Repair damaged products',
     'description': """
 The aim is to have a complete module to manage all products repairs.
diff --git a/addons/sale_coupon/__manifest__.py b/addons/sale_coupon/__manifest__.py
index 515293d00c0..59e0d22d6f5 100644
--- a/addons/sale_coupon/__manifest__.py
+++ b/addons/sale_coupon/__manifest__.py
@@ -4,7 +4,7 @@
     'name': "Sale Coupon",
     'summary': "Use discount coupons in sales orders",
     'description': """Integrate coupon mechanism in sales orders.""",
-    'category': 'Sales',
+    'category': 'Sales/Sales',
     'version': '1.0',
     'depends': ['sale_management'],
     'data': [
diff --git a/addons/sale_coupon_delivery/__manifest__.py b/addons/sale_coupon_delivery/__manifest__.py
index f5a84c3da02..418be3f1dbe 100644
--- a/addons/sale_coupon_delivery/__manifest__.py
+++ b/addons/sale_coupon_delivery/__manifest__.py
@@ -4,7 +4,7 @@
     'name': "Sale Coupon Delivery",
     'summary': """Allows to offer free shippings in coupon reward""",
     'description': """Integrate coupon mechanism with shipping costs.""",
-    'category': 'Sales',
+    'category': 'Sales/Sales',
     'version': '1.0',
     'depends': ['sale_coupon', 'delivery'],
     'data': [
diff --git a/addons/sale_expense/__manifest__.py b/addons/sale_expense/__manifest__.py
index 7b6f43e2c37..d9423916673 100644
--- a/addons/sale_expense/__manifest__.py
+++ b/addons/sale_expense/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Sales Expense',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Sales/Sales',
     'summary': 'Quotation, Sales Orders, Delivery & Invoicing Control',
     'description': """
 Reinvoice Employee Expense
diff --git a/addons/sale_management/__manifest__.py b/addons/sale_management/__manifest__.py
index 98f77d20956..08d9106bf87 100644
--- a/addons/sale_management/__manifest__.py
+++ b/addons/sale_management/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Sales',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Sales/Sales',
     'sequence': 17,
     'summary': 'From quotations to invoices',
     'description': """
diff --git a/addons/sale_margin/__manifest__.py b/addons/sale_margin/__manifest__.py
index 0da258e4932..f51fdc1c828 100644
--- a/addons/sale_margin/__manifest__.py
+++ b/addons/sale_margin/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Margins in Sales Orders',
     'version':'1.0',
-    'category': 'Sales',
+    'category': 'Sales/Sales',
     'description': """
 This module adds the 'Margin' on sales order.
 =============================================
diff --git a/addons/sale_product_matrix/__manifest__.py b/addons/sale_product_matrix/__manifest__.py
index c4a6f9f0f26..0b3e5564694 100644
--- a/addons/sale_product_matrix/__manifest__.py
+++ b/addons/sale_product_matrix/__manifest__.py
@@ -7,7 +7,7 @@
         This module allows to fill Sales Order rapidly
         by choosing product variants quantity through a Grid Entry.
     """,
-    'category': 'Sales',
+    'category': 'Sales/Sales',
     'version': '1.0',
     'depends': ['sale', 'product_matrix', 'sale_product_configurator'],
     'data': [
diff --git a/addons/sale_quotation_builder/__manifest__.py b/addons/sale_quotation_builder/__manifest__.py
index eab71371c05..38b6b6e9a18 100644
--- a/addons/sale_quotation_builder/__manifest__.py
+++ b/addons/sale_quotation_builder/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Quotation Builder',
-    'category': 'Sales',
+    'category': 'Sales/Sales',
     'summary': 'Build great quotation templates',
     'website': 'https://www.odoo.com/page/quote-builder',
     'version': '1.0',
diff --git a/addons/social_media/__manifest__.py b/addons/social_media/__manifest__.py
index cf45a12f6a4..0086d843ac5 100644
--- a/addons/social_media/__manifest__.py
+++ b/addons/social_media/__manifest__.py
@@ -9,7 +9,7 @@ The purpose of this technical module is to provide a front for
 social media configuration for any other module that might need it.
     """,
     'author': "Odoo S.A.",
-    'category': 'Uncategorized',
+    'category': 'Hidden',
     'version': '0.1',
     'depends': ['base'],
 
diff --git a/addons/stock_dropshipping/__manifest__.py b/addons/stock_dropshipping/__manifest__.py
index 9d092675cf2..25ec5242764 100644
--- a/addons/stock_dropshipping/__manifest__.py
+++ b/addons/stock_dropshipping/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Drop Shipping',
     'version': '1.0',
-    'category': 'Warehouse',
+    'category': 'Operations/Inventory',
     'summary': 'Drop Shipping',
     'description': """
 Manage drop shipping orders
diff --git a/addons/stock_landed_costs/__manifest__.py b/addons/stock_landed_costs/__manifest__.py
index d11472b8e0b..66bff5bca41 100644
--- a/addons/stock_landed_costs/__manifest__.py
+++ b/addons/stock_landed_costs/__manifest__.py
@@ -11,7 +11,7 @@ Landed Costs Management
 This module allows you to easily add extra costs on pickings and decide the split of these costs among their stock moves in order to take them into account in your stock valuation.
     """,
     'depends': ['stock_account', 'purchase_stock'],
-    'category': 'Warehouse',
+    'category': 'Operations/Inventory',
     'sequence': 16,
     'demo': [
     ],
diff --git a/addons/stock_picking_batch/__manifest__.py b/addons/stock_picking_batch/__manifest__.py
index aed3385d645..c11eea2b28e 100644
--- a/addons/stock_picking_batch/__manifest__.py
+++ b/addons/stock_picking_batch/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Warehouse Management: Batch Transfer',
     'version': '1.0',
-    'category': 'Warehouse',
+    'category': 'Operations/Inventory',
     'description': """
 This module adds the batch transfer option in warehouse management
 ==================================================================
diff --git a/addons/theme_bootswatch/__manifest__.py b/addons/theme_bootswatch/__manifest__.py
index bf6af7f0073..acefd9511a9 100644
--- a/addons/theme_bootswatch/__manifest__.py
+++ b/addons/theme_bootswatch/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Bootswatch Theme',
     'description': 'Bootswatch themes',
-    'category': 'Theme/Corporate',
+    'category': 'Theme',
     'sequence': 900,
     'version': '1.0',
     'depends': ['website', 'website_theme_install'],
diff --git a/addons/theme_default/__manifest__.py b/addons/theme_default/__manifest__.py
index 0a001245d21..aaac9fa618b 100644
--- a/addons/theme_default/__manifest__.py
+++ b/addons/theme_default/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Default Theme',
     'description': 'Default website theme',
-    'category': 'Theme/Corporate',
+    'category': 'Theme',
     'sequence': 1000,
     'version': '1.0',
     'depends': ['website', 'website_theme_install'],
diff --git a/addons/transifex/__manifest__.py b/addons/transifex/__manifest__.py
index 98a1341bcec..0573bc81985 100644
--- a/addons/transifex/__manifest__.py
+++ b/addons/transifex/__manifest__.py
@@ -5,7 +5,7 @@
     'name': 'Transifex integration',
     'version': '1.0',
     'summary': 'Add a link to edit a translation in Transifex',
-    'category': 'Extra Tools',
+    'category': 'Tools',
     'description':
     """
 Transifex integration
diff --git a/addons/uom/__manifest__.py b/addons/uom/__manifest__.py
index 390682370b9..d3eaaa9ed51 100644
--- a/addons/uom/__manifest__.py
+++ b/addons/uom/__manifest__.py
@@ -4,7 +4,7 @@
 {
     'name': 'Units of measure',
     'version': '1.0',
-    'category': 'Sales',
+    'category': 'Sales/Sales',
     'depends': ['base'],
     'description': """
 This is the base module for managing Units of measure.
diff --git a/addons/web_unsplash/__manifest__.py b/addons/web_unsplash/__manifest__.py
index a139e64743b..711b62086e8 100644
--- a/addons/web_unsplash/__manifest__.py
+++ b/addons/web_unsplash/__manifest__.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Unsplash Image Library',
-    'category': 'Web',
+    'category': 'Hidden',
     'summary': 'Find free high-resolution images from Unsplash',
     'version': '1.1',
     'description': """Explore the free high-resolution image library of Unsplash.com and find images to use in Odoo. An Unsplash search bar is added to the image library modal.""",
diff --git a/addons/website_blog/__manifest__.py b/addons/website_blog/__manifest__.py
index 94643b5f836..eecc9475f40 100644
--- a/addons/website_blog/__manifest__.py
+++ b/addons/website_blog/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Blogs',
-    'category': 'Website',
+    'category': 'Website/Website',
     'sequence': 140,
     'website': 'https://www.odoo.com/page/blog-engine',
     'summary': 'Publish blog posts, announces, news',
diff --git a/addons/website_crm/__manifest__.py b/addons/website_crm/__manifest__.py
index 20b6c6577c6..c9b5ecd0add 100644
--- a/addons/website_crm/__manifest__.py
+++ b/addons/website_crm/__manifest__.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Contact Form',
-    'category': 'Website',
+    'category': 'Website/Website',
     'sequence': 54,
     'summary': 'Generate leads from a contact form',
     'version': '2.1',
diff --git a/addons/website_crm_livechat/__manifest__.py b/addons/website_crm_livechat/__manifest__.py
index 58ab68bf201..c2ea82092be 100644
--- a/addons/website_crm_livechat/__manifest__.py
+++ b/addons/website_crm_livechat/__manifest__.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Lead Livechat Sessions',
-    'category': 'Website',
+    'category': 'Website/Website',
     'summary': 'View livechat sessions for leads',
     'version': '1.0',
     'description': """ Adds a stat button on lead form view to access their livechat sessions.""",
diff --git a/addons/website_crm_partner_assign/__manifest__.py b/addons/website_crm_partner_assign/__manifest__.py
index eb615286506..4193bbf6a1b 100644
--- a/addons/website_crm_partner_assign/__manifest__.py
+++ b/addons/website_crm_partner_assign/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Resellers',
-    'category': 'Website',
+    'category': 'Website/Website',
     'summary': 'Publish your resellers/partners and forward leads to them',
     'version': '1.0',
     'description': """
diff --git a/addons/website_customer/__manifest__.py b/addons/website_customer/__manifest__.py
index fe6c0e46521..3dde2763480 100644
--- a/addons/website_customer/__manifest__.py
+++ b/addons/website_customer/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Customer References',
-    'category': 'Website',
+    'category': 'Website/Website',
     'summary': 'Publish your customer references',
     'version': '1.0',
     'description': """
diff --git a/addons/website_event/__manifest__.py b/addons/website_event/__manifest__.py
index f2c01a1ad72..41ec364252f 100644
--- a/addons/website_event/__manifest__.py
+++ b/addons/website_event/__manifest__.py
@@ -2,7 +2,7 @@
 
 {
     'name': 'Events',
-    'category': 'Website',
+    'category': 'Website/Website',
     'sequence': 166,
     'summary': 'Publish events, sell tickets',
     'website': 'https://www.odoo.com/page/events',
diff --git a/addons/website_event_sale/__manifest__.py b/addons/website_event_sale/__manifest__.py
index b5094dfffd5..ff3315b4937 100644
--- a/addons/website_event_sale/__manifest__.py
+++ b/addons/website_event_sale/__manifest__.py
@@ -2,7 +2,7 @@
 
 {
     'name': "Online Event Ticketing",
-    'category': 'Website',
+    'category': 'Website/Website',
     'summary': "Sell event tickets online",
     'description': """
 Sell event tickets through eCommerce app.
diff --git a/addons/website_form/__manifest__.py b/addons/website_form/__manifest__.py
index df6052f43b5..c052f3168ed 100644
--- a/addons/website_form/__manifest__.py
+++ b/addons/website_form/__manifest__.py
@@ -1,6 +1,6 @@
 {
     'name': 'Website Form',
-    'category': 'Website',
+    'category': 'Website/Website',
     'summary': 'Build custom web forms',
     'description': """
         Customize and create your own web forms.
diff --git a/addons/website_form_project/__manifest__.py b/addons/website_form_project/__manifest__.py
index e8e3877d2af..86dfc1f8260 100644
--- a/addons/website_form_project/__manifest__.py
+++ b/addons/website_form_project/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Online Task Submission',
-    'category': 'Website',
+    'category': 'Website/Website',
     'summary': 'Add a task suggestion form to your website',
     'version': '1.0',
     'description': """
diff --git a/addons/website_forum/__manifest__.py b/addons/website_forum/__manifest__.py
index 02a5fa87fa2..c3b2ee4b982 100644
--- a/addons/website_forum/__manifest__.py
+++ b/addons/website_forum/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Forum',
-    'category': 'Website',
+    'category': 'Website/Website',
     'sequence': 150,
     'summary': 'Manage a forum with FAQ and Q&A',
     'version': '1.0',
diff --git a/addons/website_gengo/__manifest__.py b/addons/website_gengo/__manifest__.py
index d7a08fabacd..6e4443ce5d3 100644
--- a/addons/website_gengo/__manifest__.py
+++ b/addons/website_gengo/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Gengo Translator',
-    'category': 'Website',
+    'category': 'Website/Website',
     'summary': 'Translate website in one-click',
     'description': """
 This module allows to send website content to Gengo translation service in a single click. Gengo then gives back the translated terms in the destination language.
diff --git a/addons/website_google_map/__manifest__.py b/addons/website_google_map/__manifest__.py
index 39579800bae..39f68854fd3 100644
--- a/addons/website_google_map/__manifest__.py
+++ b/addons/website_google_map/__manifest__.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Google Maps',
-    'category': 'Website',
+    'category': 'Website/Website',
     'summary': 'Show your company address on Google Maps',
     'version': '1.0',
     'description': """
diff --git a/addons/website_hr_recruitment/__manifest__.py b/addons/website_hr_recruitment/__manifest__.py
index 951ac890291..0625a30fea9 100644
--- a/addons/website_hr_recruitment/__manifest__.py
+++ b/addons/website_hr_recruitment/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Online Jobs',
-    'category': 'Website',
+    'category': 'Website/Website',
     'sequence': 142,
     'version': '1.0',
     'summary': 'Manage your online hiring process',
diff --git a/addons/website_links/__manifest__.py b/addons/website_links/__manifest__.py
index 2d071f80917..36d2e2627ed 100644
--- a/addons/website_links/__manifest__.py
+++ b/addons/website_links/__manifest__.py
@@ -1,6 +1,6 @@
 {
     'name': 'Link Tracker',
-    'category': 'Website',
+    'category': 'Website/Website',
     'summary': 'Generate trackable & short URLs',
     'description': """
 Generate short links with analytics trackers (UTM) to share your pages through marketing campaigns.
diff --git a/addons/website_livechat/__manifest__.py b/addons/website_livechat/__manifest__.py
index 9677350cb25..c53d2bbbb20 100644
--- a/addons/website_livechat/__manifest__.py
+++ b/addons/website_livechat/__manifest__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 {
     'name': 'Website Live Chat',
-    'category': 'Technical Settings',
+    'category': 'Hidden',
     'summary': 'Chat with your website visitors',
     'version': '1.0',
     'description': """
diff --git a/addons/website_mail_channel/__manifest__.py b/addons/website_mail_channel/__manifest__.py
index 7a68bb38a1e..3142ef55527 100644
--- a/addons/website_mail_channel/__manifest__.py
+++ b/addons/website_mail_channel/__manifest__.py
@@ -2,7 +2,7 @@
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 {
     'name': 'Website Mail Channels',
-    'category': 'Website',
+    'category': 'Website/Website',
     'summary': 'Allow visitors to join public mail channels',
     'description': """
 Visitors can join public mail channels managed in the Discuss app in order to get regular updates or reach out with your community.
diff --git a/addons/website_mass_mailing/__manifest__.py b/addons/website_mass_mailing/__manifest__.py
index 11c494b5673..38cb86704e2 100644
--- a/addons/website_mass_mailing/__manifest__.py
+++ b/addons/website_mass_mailing/__manifest__.py
@@ -9,7 +9,7 @@ This module brings a new building block with a mailing list widget to drop on an
 On a simple click, your visitors can subscribe to mailing lists managed in the Email Marketing app.
     """,
     'version': '1.0',
-    'category': 'Website',
+    'category': 'Website/Website',
     'depends': ['website', 'mass_mailing'],
     'data': [
         'security/ir.model.access.csv',
diff --git a/addons/website_membership/__manifest__.py b/addons/website_membership/__manifest__.py
index 02041b3ff61..7246cc2ced2 100644
--- a/addons/website_membership/__manifest__.py
+++ b/addons/website_membership/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Online Members Directory',
-    'category': 'Website',
+    'category': 'Website/Website',
     'summary': 'Publish your members directory',
     'version': '1.0',
     'description': """
diff --git a/addons/website_partner/__manifest__.py b/addons/website_partner/__manifest__.py
index 02537495b02..ab346329c5e 100644
--- a/addons/website_partner/__manifest__.py
+++ b/addons/website_partner/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Website Partner',
-    'category': 'Technical Settings',
+    'category': 'Hidden',
     'summary': 'Partner module for website',
     'version': '0.1',
     'description': """
diff --git a/addons/website_payment/__manifest__.py b/addons/website_payment/__manifest__.py
index 8a1307ce2c6..862483255bb 100644
--- a/addons/website_payment/__manifest__.py
+++ b/addons/website_payment/__manifest__.py
@@ -2,7 +2,7 @@
 
 {
     'name': 'Website Payment',
-    'category': 'Technical Settings',
+    'category': 'Hidden',
     'summary': 'Payment integration with website',
     'version': '1.0',
     'description': """
diff --git a/addons/website_sale/__manifest__.py b/addons/website_sale/__manifest__.py
index 8703258bc36..5dfea3c026a 100644
--- a/addons/website_sale/__manifest__.py
+++ b/addons/website_sale/__manifest__.py
@@ -1,6 +1,6 @@
 {
     'name': 'eCommerce',
-    'category': 'Website',
+    'category': 'Website/Website',
     'sequence': 55,
     'summary': 'Sell your products online',
     'website': 'https://www.odoo.com/page/e-commerce',
diff --git a/addons/website_sale_comparison/__manifest__.py b/addons/website_sale_comparison/__manifest__.py
index e1cd7600f5e..c96148ea0d9 100644
--- a/addons/website_sale_comparison/__manifest__.py
+++ b/addons/website_sale_comparison/__manifest__.py
@@ -11,7 +11,7 @@ To configure product attributes, activate *Attributes & Variants* in the Website
 Finally, the module comes with an option to display an attribute summary table in product web pages (available in Customize menu).
     """,
     'author': 'Odoo SA',
-    'category': 'Website',
+    'category': 'Website/Website',
     'version': '1.0',
     'depends': ['website_sale'],
     'data': [
diff --git a/addons/website_sale_coupon/__manifest__.py b/addons/website_sale_coupon/__manifest__.py
index bec5b9dfa79..a47199d8055 100644
--- a/addons/website_sale_coupon/__manifest__.py
+++ b/addons/website_sale_coupon/__manifest__.py
@@ -8,7 +8,7 @@ Create coupon and promotion codes to share in order to boost your sales (free pr
 
 Coupon & promotion programs can be edited in the Catalog menu of the Website app.
     """,
-    'category': 'Website',
+    'category': 'Website/Website',
     'version': '1.0',
     'depends': ['website_sale', 'sale_coupon'],
     'data': [
diff --git a/addons/website_sale_coupon_delivery/__manifest__.py b/addons/website_sale_coupon_delivery/__manifest__.py
index f6ea078f258..b0c32eba02e 100644
--- a/addons/website_sale_coupon_delivery/__manifest__.py
+++ b/addons/website_sale_coupon_delivery/__manifest__.py
@@ -4,7 +4,7 @@
     'name': "Free Delivery with Coupon on eCommerce",
     'summary': """Allows to offer free shippings in coupon reward on eCommerce""",
     'description': """Allows to offer free shippings in coupon reward on eCommerce""",
-    'category': 'Website',
+    'category': 'Website/Website',
     'version': '1.0',
     'depends': ['website_sale_delivery', 'sale_coupon_delivery'],
     'data': [
diff --git a/addons/website_sale_delivery/__manifest__.py b/addons/website_sale_delivery/__manifest__.py
index bc3b0187a89..6c4f0ee157d 100644
--- a/addons/website_sale_delivery/__manifest__.py
+++ b/addons/website_sale_delivery/__manifest__.py
@@ -1,6 +1,6 @@
 {
     'name': 'eCommerce Delivery',
-    'category': 'Website',
+    'category': 'Website/Website',
     'summary': 'Add delivery costs to online sales',
     'version': '1.0',
     'description': """
diff --git a/addons/website_sale_digital/__manifest__.py b/addons/website_sale_digital/__manifest__.py
index 21de39c8501..72d13f1aa8c 100644
--- a/addons/website_sale_digital/__manifest__.py
+++ b/addons/website_sale_digital/__manifest__.py
@@ -3,7 +3,7 @@
     'name': 'Digital Products',
     'version': '0.1',
     'summary': 'Sell digital products in your eCommerce store',
-    'category': 'Website',
+    'category': 'Website/Website',
     'description': """
 Sell e-goods in your eCommerce store (e.g. webinars, articles, e-books, video tutorials).
 To do so, create the product and attach the file to share via the *Files* button of the product form.
diff --git a/addons/website_sale_management/__manifest__.py b/addons/website_sale_management/__manifest__.py
index 28d22a49eac..c31946ca535 100644
--- a/addons/website_sale_management/__manifest__.py
+++ b/addons/website_sale_management/__manifest__.py
@@ -2,7 +2,7 @@
 {
     'name': 'Website - Sales Management',
     'version': '1.0',
-    'category': 'Technical Settings',
+    'category': 'Hidden',
     'description': """
 Display orders to invoice in website dashboard.
 """,
diff --git a/addons/website_sale_product_configurator/__manifest__.py b/addons/website_sale_product_configurator/__manifest__.py
index 690eef24235..0e6782664de 100644
--- a/addons/website_sale_product_configurator/__manifest__.py
+++ b/addons/website_sale_product_configurator/__manifest__.py
@@ -6,7 +6,7 @@
     'description': """
         Bridge module to make the website e-commerce compatible with the product configurator
     """,
-    'category': 'Technical Settings',
+    'category': 'Hidden',
     'version': '0.1',
     'depends': ['website_sale', 'sale_product_configurator'],
     'auto_install': True,
diff --git a/addons/website_sale_stock/__manifest__.py b/addons/website_sale_stock/__manifest__.py
index 758886bfd29..590d8ad9aaa 100644
--- a/addons/website_sale_stock/__manifest__.py
+++ b/addons/website_sale_stock/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Product Availability',
-    'category': 'Website',
+    'category': 'Website/Website',
     'summary': 'Manage product inventory & availability',
     'description': """
 Manage the inventory of your products and display their availability status in your eCommerce store.
diff --git a/addons/website_sale_stock_product_configurator/__manifest__.py b/addons/website_sale_stock_product_configurator/__manifest__.py
index 57585633da3..b2e7ac9569c 100644
--- a/addons/website_sale_stock_product_configurator/__manifest__.py
+++ b/addons/website_sale_stock_product_configurator/__manifest__.py
@@ -6,7 +6,7 @@
     'description': """
         Bridge module to make the website e-commerce stock management compatible with the product configurator
     """,
-    'category': 'Technical Settings',
+    'category': 'Hidden',
     'version': '1.0',
     'depends': ['website_sale_stock', 'sale_product_configurator'],
     'auto_install': True,
diff --git a/addons/website_sale_wishlist/__manifest__.py b/addons/website_sale_wishlist/__manifest__.py
index 587796eba07..6f6e2e56a0d 100644
--- a/addons/website_sale_wishlist/__manifest__.py
+++ b/addons/website_sale_wishlist/__manifest__.py
@@ -7,7 +7,7 @@
 Allow shoppers of your eCommerce store to create personalized collections of products they want to buy and save them for future reference.
     """,
     'author': 'Odoo SA',
-    'category': 'Website',
+    'category': 'Website/Website',
     'version': '1.0',
     'depends': ['website_sale'],
     'data': [
diff --git a/addons/website_slides/__manifest__.py b/addons/website_slides/__manifest__.py
index 1da8adc4eee..4952898411c 100644
--- a/addons/website_slides/__manifest__.py
+++ b/addons/website_slides/__manifest__.py
@@ -5,7 +5,7 @@
     'sequence': 145,
     'summary': 'Manage and publish an eLearning platform',
     'website': 'https://www.odoo.com/page/slides',
-    'category': 'Website',
+    'category': 'Website/Website',
     'description': """
 Create Online Courses
 =====================
diff --git a/addons/website_theme_install/__manifest__.py b/addons/website_theme_install/__manifest__.py
index 26266cb8ff3..4b85f6199c2 100644
--- a/addons/website_theme_install/__manifest__.py
+++ b/addons/website_theme_install/__manifest__.py
@@ -2,7 +2,7 @@
     'name': 'Website Theme Install',
     'summary': 'Select a theme for your website',
     'description': "",
-    'category': 'Technical Settings',
+    'category': 'Hidden',
     'version': '1.0',
     'data': [
         'views/assets.xml',
diff --git a/addons/website_twitter/__manifest__.py b/addons/website_twitter/__manifest__.py
index 8dd8be817d5..1eae0b31415 100644
--- a/addons/website_twitter/__manifest__.py
+++ b/addons/website_twitter/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     'name': 'Twitter Snippet',
-    'category': 'Website',
+    'category': 'Website/Website',
     'summary': 'Twitter scroller snippet in website',
     'version': '1.0',
     'description': """
diff --git a/odoo/addons/base/data/ir_module_category_data.xml b/odoo/addons/base/data/ir_module_category_data.xml
index d99fed12077..23b941e4e6d 100644
--- a/odoo/addons/base/data/ir_module_category_data.xml
+++ b/odoo/addons/base/data/ir_module_category_data.xml
@@ -29,13 +29,59 @@
             <field name="sequence">9</field>
         </record>
 
+        <record model="ir.module.category" id="module_category_accounting_accounting">
+            <field name="name">Invoicing</field>
+            <field name="sequence">4</field>
+        </record>
+
+        <record model="ir.module.category" id="module_category_sales">
+            <field name="name">Sales</field>
+            <field name="sequence">6</field>
+        </record>
+
+        <record model="ir.module.category" id="module_category_human_resources">
+            <field name="name">Human Resources</field>
+            <field name="sequence">8</field>
+        </record>
+
+        <record model="ir.module.category" id="module_category_operations">
+            <field name="name">Operations</field>
+            <field name="sequence">10</field>
+        </record>
+
+        <record model="ir.module.category" id="module_category_marketing">
+            <field name="name">Marketing</field>
+            <field name="sequence">12</field>
+        </record>
+
+        <record model="ir.module.category" id="module_category_manufacturing">
+            <field name="name">Manufacturing</field>
+            <field name="sequence">14</field>
+        </record>
+
+        <record model="ir.module.category" id="module_category_website">
+            <field name="name">Website</field>
+            <field name="sequence">16</field>
+        </record>
+
+        <record model="ir.module.category" id="module_category_theme">
+            <field name="name">Theme</field>
+            <field name="exclusive" eval="0"/>
+            <field name="sequence">50</field>
+        </record>
+
+        <record model="ir.module.category" id="module_category_administration">
+            <field name="name">Administration</field>
+            <field name="sequence">100</field>
+        </record>
+
         <record model="ir.module.category" id="module_category_human_resources_appraisals">
             <field name="name">Appraisals</field>
             <field name="description">Helps you manage your appraisals.</field>
             <field name="sequence">15</field>
         </record>
 
-        <record model="ir.module.category" id="module_category_communication_sign">
+        <record model="ir.module.category" id="module_category_sales_sign">
             <field name="name">Sign</field>
             <field name="description">Helps you sign and complete your documents easily.</field>
             <field name="sequence">25</field>
@@ -47,21 +93,9 @@
             <field name="sequence">14</field>
         </record>
 
-        <record model="ir.module.category" id="module_category_theme">
-            <field name="name">Theme</field>
-            <field name="exclusive" eval="0"/>
-            <field name="sequence">50</field>
-        </record>
-
         <record model="ir.module.category" id="module_category_administration_administration">
             <field name="name">Administration</field>
-            <field name="sequence">100</field>
-        </record>
-
-        <record model="ir.module.category" id="module_category_administration">
-            <field name="name">Administration</field>
-            <field name="sequence">100</field>
-            <field name="parent_id" ref="module_category_administration_administration"/>
+            <field name="parent_id" ref="module_category_administration"/>
         </record>
 
         <record model="ir.module.category" id="module_category_usability">
@@ -76,10 +110,10 @@
 
         <!-- add applications to base groups -->
         <record model="res.groups" id="group_erp_manager">
-            <field name="category_id" ref="module_category_administration"/>
+            <field name="category_id" ref="module_category_administration_administration"/>
         </record>
         <record model="res.groups" id="group_system">
-            <field name="category_id" ref="module_category_administration"/>
+            <field name="category_id" ref="module_category_administration_administration"/>
         </record>
 
         <record model="res.groups" id="group_user">
diff --git a/odoo/addons/base/data/ir_module_module.xml b/odoo/addons/base/data/ir_module_module.xml
index 79b27dfd4fe..62a5feaaf10 100644
--- a/odoo/addons/base/data/ir_module_module.xml
+++ b/odoo/addons/base/data/ir_module_module.xml
@@ -6,7 +6,7 @@
             <field name="name">web_studio</field>
             <field name="shortdesc">Studio</field>
             <field name="sequence">17</field>
-            <field name="category_id" ref="base.module_category_administration"/>
+            <field name="category_id" ref="base.module_category_administration_administration"/>
             <field name="application" eval="True"/>
             <field name="summary">Create and Customize Applications</field>
             <field name="license">OEEL-1</field>
@@ -34,7 +34,7 @@
             <field name="name">account_accountant</field>
             <field name="sequence">15</field>
             <field name="shortdesc">Accounting</field>
-            <field name="category_id" ref="base.module_category_accounting_invoicing"/>
+            <field name="category_id" ref="base.module_category_accounting_accounting"/>
             <field name="application" eval="True"/>
             <field name="summary">Accounting, Taxes, Budgets, Assets...</field>
             <field name="license">OEEL-1</field>
@@ -155,7 +155,7 @@
         <record model="ir.module.module" id="base.module_sign">
             <field name="name">sign</field>
             <field name="shortdesc">Sign</field>
-            <field name="category_id" ref="base.module_category_communication_sign"/>
+            <field name="category_id" ref="base.module_category_sales_sign"/>
             <field name="application" eval="True"/>
             <field name="summary">Send documents to sign online</field>
             <field name="license">OEEL-1</field>
@@ -224,7 +224,7 @@
             <field name="name">web_mobile</field>
             <field name="sequence">220</field>
             <field name="shortdesc">Android &amp; iPhone</field>
-            <field name="category_id" ref="base.module_category_administration"/>
+            <field name="category_id" ref="base.module_category_administration_administration"/>
             <field name="application" eval="True"/>
             <field name="summary">Support for Android &amp; iOS Apps</field>
             <field name="license">OEEL-1</field>
@@ -249,7 +249,7 @@
             <field name="name">payment_sepa_direct_debit</field>
             <field name="shortdesc">Sepa Direct Debit Payment Acquirer</field>
             <field name="summary">Checkout with SEPA Direct Debit</field>
-            <field name="category_id" ref="base.module_category_accounting_invoicing"/>
+            <field name="category_id" ref="base.module_category_accounting_accounting"/>
             <field name="license">OEEL-1</field>
             <field name="author">Odoo S.A.</field>
             <field name="to_buy" eval="True"/>
diff --git a/odoo/addons/base/i18n/base.pot b/odoo/addons/base/i18n/base.pot
index edaec8885fd..26f69fd003e 100644
--- a/odoo/addons/base/i18n/base.pot
+++ b/odoo/addons/base/i18n/base.pot
@@ -12391,7 +12391,7 @@ msgid ""
 msgstr ""
 
 #. module: base
-#: model:ir.module.category,description:base.module_category_manufacturing_manufacturing
+#: model:ir.module.category,description:base.module_category_manufacturing
 msgid ""
 "Helps you manage your manufacturing processes and generate reports on those "
 "processes."
@@ -14787,7 +14787,7 @@ msgstr ""
 
 #. module: base
 #: model:ir.module.category,name:base.module_category_manufacturing
-#: model:ir.module.category,name:base.module_category_manufacturing_manufacturing
+#: model:ir.module.category,name:base.module_category_manufacturing
 #: model:ir.module.module,shortdesc:base.module_mrp
 #: model_terms:ir.ui.view,arch_db:base.user_groups_view
 #: model:res.partner.industry,name:base.res_partner_industry_C
diff --git a/odoo/addons/test_access_rights/__manifest__.py b/odoo/addons/test_access_rights/__manifest__.py
index a44495cc54e..84db875a150 100644
--- a/odoo/addons/test_access_rights/__manifest__.py
+++ b/odoo/addons/test_access_rights/__manifest__.py
@@ -2,6 +2,7 @@
     'name': 'test of access rights and rules',
     'description': "Testing of access restrictions",
     'version': '0.0.1',
+    'category': 'Tests',
     'data': [
         'ir.model.access.csv',
         'data.xml',
diff --git a/odoo/addons/test_action_bindings/__manifest__.py b/odoo/addons/test_action_bindings/__manifest__.py
index 2486286196a..b64e92753fd 100644
--- a/odoo/addons/test_action_bindings/__manifest__.py
+++ b/odoo/addons/test_action_bindings/__manifest__.py
@@ -1,5 +1,6 @@
 {
     'name': "Test Action Bindings",
+    'category': 'Tests',
     'data': [
         'ir.model.access.csv',
         'test_data.xml',
diff --git a/odoo/addons/test_convert/__manifest__.py b/odoo/addons/test_convert/__manifest__.py
index 1411f093f90..c12f91b2f9a 100644
--- a/odoo/addons/test_convert/__manifest__.py
+++ b/odoo/addons/test_convert/__manifest__.py
@@ -5,6 +5,7 @@
     'name': 'test_convert',
     'description': "Data for xml conversion tests",
     'version': '0.0.1',
+    'category': 'Tests',
     'data': [
         'ir.model.access.csv',
     ]