diff --git a/addons/account/__manifest__.py b/addons/account/__manifest__.py
index fdb296eb7b1..fd56de27e03 100644
--- a/addons/account/__manifest__.py
+++ b/addons/account/__manifest__.py
@@ -6,11 +6,7 @@
     'summary': 'Send Invoices and Track Payments',
     'sequence': 30,
     'description': """
-Invoicing & Payments
-====================
-The specific and easy-to-use Invoicing system in Odoo allows you to keep track of your accounting, even when you are not an accountant. It provides an easy way to follow up on your vendors and customers.
-
-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.
+Core mechanisms for the accounting modules. To display the menuitems, install the module account_invoicing.
     """,
     'category': 'Accounting',
     'website': 'https://www.odoo.com/page/billing',
@@ -75,7 +71,7 @@ You could use this simplified accounting in case you work with an (external) acc
         "static/src/xml/account_report_backend.xml",
     ],
     'installable': True,
-    'application': True,
+    'application': False,
     'auto_install': False,
     'post_init_hook': '_auto_install_l10n',
 }
diff --git a/addons/account/views/account_menuitem.xml b/addons/account/views/account_menuitem.xml
index af0457d9b08..92e59ad21e1 100644
--- a/addons/account/views/account_menuitem.xml
+++ b/addons/account/views/account_menuitem.xml
@@ -6,9 +6,13 @@
         <menuitem name="Invoicing"
             id="menu_finance"
             groups="group_account_user,group_account_manager,group_account_invoice"
-            web_icon="account,static/description/icon.png"
+            web_icon="account_invoicing,static/description/icon.png"
             sequence="40"/>
 
+        <record id="menu_finance" model="ir.ui.menu">
+            <field name="active" eval="False"/>
+        </record>
+
         <menuitem id="menu_finance_receivables" name="Sales" parent="menu_finance" sequence="2"/>
         <menuitem id="menu_finance_payables" name="Purchases" parent="menu_finance" sequence="3"/>
         <menuitem id="menu_finance_entries" name="Adviser" parent="menu_finance" sequence="4" groups="group_account_manager"/>
diff --git a/addons/account_accountant/__manifest__.py b/addons/account_accountant/__manifest__.py
index f8af161bd47..d9f442828b4 100644
--- a/addons/account_accountant/__manifest__.py
+++ b/addons/account_accountant/__manifest__.py
@@ -14,7 +14,7 @@ It gives the Administrator user access to all accounting features such as journa
 It assigns manager and user access rights to the Administrator for the accounting application and only user rights to the Demo user.
 """,
     'website': 'https://www.odoo.com/page/accounting',
-    'depends': ['account', 'web_tour'],
+    'depends': ['account_invoicing', 'web_tour'],
     'data': [
         'data/account_accountant_data.xml',
         'security/account_accountant_security.xml',
diff --git a/addons/account_accountant/data/account_accountant_data.xml b/addons/account_accountant/data/account_accountant_data.xml
index 11970da9d7d..8bc3efb8d40 100644
--- a/addons/account_accountant/data/account_accountant_data.xml
+++ b/addons/account_accountant/data/account_accountant_data.xml
@@ -3,7 +3,7 @@
         <!-- Rename root menu "Accounting" -->
         <!-- Top menu item -->
         <menuitem name="Accounting"
-            web_icon="account,static/description/icon.png"
+            web_icon="account_accountant,static/description/icon.png"
             id="account.menu_finance"
             sequence="40"/>
         <menuitem id="account.menu_account_config" name="Settings" parent="account.menu_finance_configuration" sequence="0" groups="base.group_system"/>
diff --git a/addons/account_invoicing/__init__.py b/addons/account_invoicing/__init__.py
new file mode 100644
index 00000000000..67dee8c60db
--- /dev/null
+++ b/addons/account_invoicing/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
diff --git a/addons/account_invoicing/__manifest__.py b/addons/account_invoicing/__manifest__.py
new file mode 100644
index 00000000000..3e1cbd67ef0
--- /dev/null
+++ b/addons/account_invoicing/__manifest__.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+{
+    'name': 'Invoicing Management',
+    'version': '1.0',
+    'summary': 'Send Invoices and Track Payments',
+    'sequence': 30,
+    'description': """
+Invoicing & Payments
+====================
+The specific and easy-to-use Invoicing system in Odoo allows you to keep track of your accounting, even when you are not an accountant. It provides an easy way to follow up on your vendors and customers.
+
+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': 'Invoicing Management',
+    'website': 'https://www.odoo.com/page/billing',
+    'depends': ['account'],
+    'data': [
+        'views/account_menuitem_views.xml',
+    ],
+    'demo': [
+    ],
+    'qweb': [
+    ],
+    'application': True,
+}
diff --git a/addons/account/static/description/account_sc_00.png b/addons/account_invoicing/static/description/account_sc_00.png
similarity index 100%
rename from addons/account/static/description/account_sc_00.png
rename to addons/account_invoicing/static/description/account_sc_00.png
diff --git a/addons/account/static/description/account_sc_01.png b/addons/account_invoicing/static/description/account_sc_01.png
similarity index 100%
rename from addons/account/static/description/account_sc_01.png
rename to addons/account_invoicing/static/description/account_sc_01.png
diff --git a/addons/account/static/description/account_sc_03.png b/addons/account_invoicing/static/description/account_sc_03.png
similarity index 100%
rename from addons/account/static/description/account_sc_03.png
rename to addons/account_invoicing/static/description/account_sc_03.png
diff --git a/addons/account/static/description/account_voucher.png b/addons/account_invoicing/static/description/account_voucher.png
similarity index 100%
rename from addons/account/static/description/account_voucher.png
rename to addons/account_invoicing/static/description/account_voucher.png
diff --git a/addons/account/static/description/analysis.png b/addons/account_invoicing/static/description/analysis.png
similarity index 100%
rename from addons/account/static/description/analysis.png
rename to addons/account_invoicing/static/description/analysis.png
diff --git a/addons/account/static/description/icon.png b/addons/account_invoicing/static/description/icon.png
similarity index 100%
rename from addons/account/static/description/icon.png
rename to addons/account_invoicing/static/description/icon.png
diff --git a/addons/account/static/description/index.html b/addons/account_invoicing/static/description/index.html
similarity index 100%
rename from addons/account/static/description/index.html
rename to addons/account_invoicing/static/description/index.html
diff --git a/addons/account_invoicing/views/account_menuitem_views.xml b/addons/account_invoicing/views/account_menuitem_views.xml
new file mode 100644
index 00000000000..947b92fe033
--- /dev/null
+++ b/addons/account_invoicing/views/account_menuitem_views.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="account.menu_finance" model="ir.ui.menu">
+        <field name="active" eval="True"/>
+    </record>
+</odoo>
diff --git a/addons/sale_management/__manifest__.py b/addons/sale_management/__manifest__.py
index 854d82f827c..b498649e819 100644
--- a/addons/sale_management/__manifest__.py
+++ b/addons/sale_management/__manifest__.py
@@ -41,7 +41,7 @@ The Dashboard for the Sales Manager will include
 * Monthly Turnover (Graph)
     """,
     'website': 'https://www.odoo.com/page/sales',
-    'depends': ['sale'],
+    'depends': ['sale', 'account_invoicing'],
     'data': [
         'views/sale_management_views.xml',
         'views/sale_management_templates.xml',