diff --git a/addons/account/views/account_analytic_view.xml b/addons/account/views/account_analytic_view.xml
index bcac4710aaf..cf94c946cc4 100644
--- a/addons/account/views/account_analytic_view.xml
+++ b/addons/account/views/account_analytic_view.xml
@@ -67,7 +67,7 @@
 
         <menuitem
             name="Analytic Entries"
-            parent="menu_finance_entries"
+            parent="menu_finance_entries_accounting_entries"
             action="analytic.account_analytic_line_action_entries"
             id="menu_action_analytic_lines_tree"
             sequence="35"
diff --git a/addons/account/views/account_cash_rounding_view.xml b/addons/account/views/account_cash_rounding_view.xml
index 5edcc1bbd3f..67fa2e5fc60 100644
--- a/addons/account/views/account_cash_rounding_view.xml
+++ b/addons/account/views/account_cash_rounding_view.xml
@@ -59,6 +59,6 @@
 
         <!-- Menu -->
         <menuitem id="menu_action_rounding_form_view" action="rounding_list_action"
-                  groups="account.group_cash_rounding" parent="account_account_menu" sequence="4"/>
+                  groups="account.group_cash_rounding" parent="account_management_menu" sequence="4"/>
     </data>
 </odoo>
diff --git a/addons/account/views/account_menuitem.xml b/addons/account/views/account_menuitem.xml
index 67919a6bed5..e4a9bc1f687 100644
--- a/addons/account/views/account_menuitem.xml
+++ b/addons/account/views/account_menuitem.xml
@@ -23,10 +23,15 @@
             <menuitem id="menu_finance_payables_documents" name="Documents" parent="menu_finance_payables" sequence="1"/>
             <menuitem id="menu_finance_payables_master_data" name="Master Data" parent="menu_finance_payables" sequence="2"/>
         <menuitem id="menu_finance_entries" name="Adviser" parent="menu_finance" sequence="4" groups="account.group_account_user"/>
+            <!-- Adviser sub-menus -->
+            <menuitem id="menu_finance_entries_accounting_entries" name="Accounting Entries" parent="account.menu_finance_entries"/>
+            <menuitem id="menu_finance_entries_management" name="Management" parent="account.menu_finance_entries"/>
+            <menuitem id="menu_finance_entries_actions" name="Actions" parent="account.menu_finance_entries"/>
+            <menuitem id="menu_finance_entries_generate_entries" name="Generate Entries" parent="account.menu_finance_entries"/>
         <menuitem id="menu_finance_reports" name="Reporting" parent="menu_finance" sequence="5" groups="account.group_account_manager"/>
             <!-- Reporting sub-menus -->
             <menuitem id="account_reports_management_menu" name="Management" parent="account.menu_finance_reports" sequence="4"/>
-            <menuitem id="account_reports_legal_statements_menu" name="US GAAP" parent="account.menu_finance_reports" sequence="1" groups="account.group_account_user"/>
+            <menuitem id="account_reports_legal_statements_menu" name="Generic Statements" parent="account.menu_finance_reports" sequence="1" groups="account.group_account_user"/>
             <menuitem id="account_reports_business_intelligence_menu" name="Business Intelligence" parent="account.menu_finance_reports" sequence="5" groups="account.group_account_invoice"/>
             <menuitem id="menu_finance_legal_statement" name="PDF Reports" parent="account.menu_finance_reports"/>
 
diff --git a/addons/account/views/account_view.xml b/addons/account/views/account_view.xml
index 25c43ed2bb4..b8063af00ca 100644
--- a/addons/account/views/account_view.xml
+++ b/addons/account/views/account_view.xml
@@ -511,7 +511,6 @@
               </p>
             </field>
         </record>
-        <menuitem id="account_tag_menu" parent="account_account_menu" action="account_tag_action" groups="base.group_no_one"/>
 
         <!-- Bank statement -->
 
@@ -1319,7 +1318,7 @@
             <field name="view_id" ref="view_move_line_tree"/>
             <field name="view_mode">tree,pivot,graph,form</field>
         </record>
-        <menuitem action="action_account_moves_all_a" id="menu_action_account_moves_all" parent="account.menu_finance_entries" sequence="1" groups="group_account_manager" />
+        <menuitem action="action_account_moves_all_a" id="menu_action_account_moves_all" parent="account.menu_finance_entries_accounting_entries" sequence="1" groups="group_account_manager" />
         <record id="action_account_moves_all_tree" model="ir.actions.act_window">
             <field name="name">Journal Items</field>
             <field name="res_model">account.move.line</field>
@@ -1534,7 +1533,7 @@
         <menuitem
             action="action_move_journal_line"
             id="menu_action_move_journal_line_form"
-            parent="account.menu_finance_entries"
+            parent="account.menu_finance_entries_accounting_entries"
             groups="account.group_account_user"
             sequence="2"/>
 
@@ -2115,8 +2114,6 @@
 
         <menuitem id="product_product_menu_purchasable" name="Purchasable Products" action="product_product_action_purchasable" parent="account.menu_finance_payables_master_data" sequence="101"/>
 
-        <menuitem id="product_configuration_menu" name="Products" parent="account.menu_finance_configuration" sequence="1"/>
-
         <menuitem id="menu_account_supplier" name="Vendors"
             parent="menu_finance_payables_master_data"
             action="base.action_partner_supplier_form" sequence="100"/>
@@ -2221,7 +2218,7 @@
             <field name="tag">manual_reconciliation_view</field>
         </record>
 
-        <menuitem id="menu_action_manual_reconciliation" parent="menu_finance_entries" action="action_manual_reconciliation" sequence="25"/>
+        <menuitem id="menu_action_manual_reconciliation" parent="menu_finance_entries_actions" action="action_manual_reconciliation" sequence="25"/>
 
         <record id="view_account_group_form" model="ir.ui.view">
             <field name="name">account.group.form</field>
@@ -2261,7 +2258,7 @@
         </record>
 
         <record id="action_account_group_tree" model="ir.actions.act_window">
-            <field name="name">Account Group</field>
+            <field name="name">Account Groups</field>
             <field name="res_model">account.group</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
diff --git a/addons/account/views/res_config_settings_views.xml b/addons/account/views/res_config_settings_views.xml
index b92b8347c04..1c37e92c172 100644
--- a/addons/account/views/res_config_settings_views.xml
+++ b/addons/account/views/res_config_settings_views.xml
@@ -19,7 +19,7 @@
                     <div class="app_settings_block" data-string="Accounting" data-key="account_invoicing" groups="account.group_account_manager">
                         <field name="has_chart_of_accounts" invisible="1"/>
                         <field name="has_accounting_entries" invisible="1"/>
-                            <h2>Fiscal Localization</h2>
+                            <h2 attrs="{'invisible': [('has_accounting_entries','!=',False)]}">Fiscal Localization</h2>
                             <div class="row mt16 o_settings_container">
                                 <div class="col-xs-12 col-md-6 o_setting_box" attrs="{'invisible': [('has_accounting_entries','!=',False)]}">
                                     <div class="o_setting_left_pane"/>
@@ -40,18 +40,6 @@
                                         </div>
                                     </div>
                                 </div>
-                                <div class="col-xs-12 col-md-6 o_setting_box" groups="account.group_account_user">
-                                    <div class="o_setting_left_pane"/>
-                                    <div class="o_setting_right_pane">
-                                        <label string="Chart of Accounts"/>
-                                        <div class="content-group">
-                                            <div class="row mt16">
-                                                <label string="# of digits on accounts" class="col-md-4 o_light_label"/>
-                                                <field name="code_digits"/>
-                                            </div>
-                                        </div>
-                                    </div>
-                                </div>
                             </div>
                         <t groups="account.group_account_user">
                             <h2>Setup</h2>
@@ -69,32 +57,6 @@
                                 </div>
                             </div>
                         </t>
-                        <h2>Accounting Reports</h2>
-                        <div class="row mt16 o_settings_container" id="accounting_reports">
-                            <div class="col-xs-12 col-md-6 o_setting_box" id="account_accountant" title="If you do not check this box, you will be able to do invoicing &amp; payments, but not accounting (Journal Items, Chart of  Accounts, ...).">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_account_accountant" widget="upgrade_boolean"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="module_account_accountant"/>
-                                    <div class="text-muted">
-                                        Add all accounting features: journal entries, legal statements, etc.
-                                    </div>
-                                </div>
-                            </div>
-                            <div class="col-xs-12 col-md-6 o_setting_box" id="fiscalyear" invisible="1"/>
-                            <div class="col-xs-12 col-md-6 o_setting_box" id="dynamic_report" invisible="1" groups="account.group_account_user">
-                                <div class="o_setting_left_pane">
-                                    <field name="module_account_reports" widget="upgrade_boolean"/>
-                                </div>
-                                <div class="o_setting_right_pane">
-                                    <label for="module_account_reports"/>
-                                    <div class="text-muted" id="account_reports">
-                                        Navigate easily through reports and see what is behind the numbers
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
                         <h2>Taxes</h2>
                         <div class="row mt16 o_settings_container">
                             <div class="col-xs-12 col-md-6 o_setting_box" title="These taxes are set in any new product created.">
@@ -274,30 +236,46 @@
                             </div>
                         </div>
 
-                        <t groups="account.group_account_user">
-                            <h2>Bills Payment</h2>
-                            <div class="row mt16 o_settings_container">
-                                <div class="col-xs-12 col-md-6 o_setting_box">
-                                    <div class="o_setting_left_pane">
-                                        <field name="module_l10n_us_check_printing" widget="upgrade_boolean"/>
-                                    </div>
-                                    <div class="o_setting_right_pane">
-                                        <label string="Checks" for="module_l10n_us_check_printing"/>
-                                        <span class="fa fa-lg fa-building-o" title="Values set here are company-specific." groups="base.group_multi_company"/>
-                                        <div class="text-muted" id="print_bills_payment">
-                                            Print checks to pay your vendors
-                                        </div>
+                        <h2>Supplier Payments</h2>
+                        <div class="row mt16 o_settings_container">
+                            <div class="col-xs-12 col-md-6 o_setting_box" groups="account.group_account_user">
+                                <div class="o_setting_left_pane">
+                                    <field name="module_l10n_us_check_printing" widget="upgrade_boolean"/>
+                                </div>
+                                <div class="o_setting_right_pane">
+                                    <label string="Checks" for="module_l10n_us_check_printing"/>
+                                    <span class="fa fa-lg fa-building-o" title="Values set here are company-specific." groups="base.group_multi_company"/>
+                                    <div class="text-muted" id="print_bills_payment">
+                                        Print checks to pay your vendors
                                     </div>
                                 </div>
-                                <div class="col-xs-12 col-md-6 o_setting_box" title="If you check this box, you will be able to register your payment using SEPA.">
-                                    <div class="o_setting_left_pane">
-                                        <field name="module_account_sepa" widget="upgrade_boolean"/>
+                            </div>
+                            <div class="col-xs-12 col-md-6 o_setting_box" title="If you check this box, you will be able to register your payment using SEPA.">
+                                <div class="o_setting_left_pane">
+                                    <field name="module_account_sepa" widget="upgrade_boolean"/>
+                                </div>
+                                <div class="o_setting_right_pane" name="sepa_right_pane">
+                                    <label string="SEPA Credit Transfer (SCT)" for="module_account_sepa"/>
+                                    <span class="fa fa-lg fa-building-o" title="Values set here are company-specific." groups="base.group_multi_company"/>
+                                    <div class="text-muted">
+                                        Pay your bills in one-click using Euro SEPA service
                                     </div>
-                                    <div class="o_setting_right_pane" name="sepa_right_pane">
-                                        <label string="SEPA Credit Transfer (SCT)" for="module_account_sepa"/>
-                                        <span class="fa fa-lg fa-building-o" title="Values set here are company-specific." groups="base.group_multi_company"/>
-                                        <div class="text-muted">
-                                            Pay your bills in one-click using Euro SEPA service
+                                </div>
+                            </div>
+                        </div>
+
+                        <t groups="account.group_account_user">
+                            <h2>Fiscal Periods</h2>
+                            <div class="row mt16 o_settings_container" id="accounting_reports">
+                                <div class="col-xs-12 col-md-6 o_setting_box" id="fiscalyear" invisible="1"/>
+                                <div class="col-xs-12 col-md-6 o_setting_box" id="dynamic_report" invisible="1" groups="account.group_account_user">
+                                    <div class="o_setting_left_pane">
+                                        <field name="module_account_reports" widget="upgrade_boolean"/>
+                                    </div>
+                                    <div class="o_setting_right_pane">
+                                        <label for="module_account_reports"/>
+                                        <div class="text-muted" id="account_reports">
+                                            Navigate easily through reports and see what is behind the numbers
                                         </div>
                                     </div>
                                 </div>
@@ -410,7 +388,7 @@
                                 </div>
                             </div>
                         </div>
-                        <h2>Invoicing</h2>
+                        <h2>Invoices</h2>
                         <div class="row mt16 o_settings_container" id="invoicing_settings">
                             <div class="col-xs-12 col-md-6 o_setting_box">
                                 <div class="o_setting_left_pane">
@@ -474,7 +452,7 @@
                                     <field name="module_account_deferred_revenue" widget="upgrade_boolean"/>
                                 </div>
                                 <div class="o_setting_right_pane">
-                                    <label for="module_account_deferred_revenue"/>
+                                    <label for="module_account_deferred_revenue" string="Deferred Revenues Management"/>
                                     <div class="text-muted">
                                         Automate deferred revenues entries for multi-year contracts
                                     </div>
diff --git a/addons/account/views/tax_adjustments.xml b/addons/account/views/tax_adjustments.xml
index 531770b6c62..06a40882fbe 100644
--- a/addons/account/views/tax_adjustments.xml
+++ b/addons/account/views/tax_adjustments.xml
@@ -7,5 +7,5 @@
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-        <menuitem action="tax_adjustments_form" id="menu_action_tax_adjustment" parent="account.menu_finance_entries" sequence="30"/>
+        <menuitem action="tax_adjustments_form" id="menu_action_tax_adjustment" parent="account.menu_finance_entries_actions" sequence="30"/>
 </odoo>
diff --git a/addons/account_asset/views/account_asset_views.xml b/addons/account_asset/views/account_asset_views.xml
index b0ada054a29..1f452d68960 100644
--- a/addons/account_asset/views/account_asset_views.xml
+++ b/addons/account_asset/views/account_asset_views.xml
@@ -303,7 +303,7 @@
         <field name="domain">[('category_id.type', '=', 'purchase')]</field>
     </record>
 
-    <menuitem parent="account.menu_finance_entries" id="menu_action_account_asset_asset_form" action="action_account_asset_asset_form" sequence="101" groups="account.group_account_user"/>
+    <menuitem parent="account.menu_finance_entries_management" id="menu_action_account_asset_asset_form" action="action_account_asset_asset_form" sequence="101" groups="account.group_account_user"/>
 
 
     <!-- Configuration -->
@@ -319,6 +319,6 @@
         <field name="context">{'default_type': 'purchase'}</field>
     </record>
 
-    <menuitem parent="account.account_management_menu" id="menu_action_account_asset_asset_list_normal_purchase" action="action_account_asset_asset_list_normal_purchase" sequence="4"/>
+    <menuitem parent="account.account_management_menu" id="menu_action_account_asset_asset_list_normal_purchase" action="action_account_asset_asset_list_normal_purchase" sequence="6"/>
 
 </odoo>
diff --git a/addons/account_asset/wizard/asset_depreciation_confirmation_wizard_views.xml b/addons/account_asset/wizard/asset_depreciation_confirmation_wizard_views.xml
index b8cb88ef9ea..ee12b167246 100644
--- a/addons/account_asset/wizard/asset_depreciation_confirmation_wizard_views.xml
+++ b/addons/account_asset/wizard/asset_depreciation_confirmation_wizard_views.xml
@@ -34,6 +34,6 @@
 
     <menuitem name="Generate Assets Entries" action="action_asset_depreciation_confirmation_wizard"
         id="menu_asset_depreciation_confirmation_wizard"
-        parent="account.menu_finance_entries" sequence="111" groups="base.group_no_one"/>
+        parent="account.menu_finance_entries_generate_entries" sequence="111" groups="base.group_no_one"/>
 
 </odoo>
diff --git a/addons/account_budget/views/account_budget_views.xml b/addons/account_budget/views/account_budget_views.xml
index 7f87783a314..c0651cb06f5 100644
--- a/addons/account_budget/views/account_budget_views.xml
+++ b/addons/account_budget/views/account_budget_views.xml
@@ -33,7 +33,7 @@
             <field name="view_id" ref="view_budget_post_tree"/>
             <field name="search_view_id" ref="view_budget_post_search"/>
         </record>
-        <menuitem action="open_budget_post_form" id="menu_budget_post_form" parent="account.account_management_menu" sequence="3"/>
+        <menuitem action="open_budget_post_form" id="menu_budget_post_form" parent="account.account_management_menu" sequence="5"/>
 
 
         <record model="ir.ui.view" id="view_budget_post_form">
@@ -230,7 +230,7 @@
               </p>
             </field>
         </record>
-        <menuitem parent="account.menu_finance_entries"
+        <menuitem parent="account.menu_finance_entries_management"
             id="menu_act_crossovered_budget_view"
             name="Budgets"
             action="act_crossovered_budget_view" sequence="60" 
diff --git a/addons/report_intrastat/views/report_intrastat_views.xml b/addons/report_intrastat/views/report_intrastat_views.xml
index eac25a13988..86247cb0fd9 100644
--- a/addons/report_intrastat/views/report_intrastat_views.xml
+++ b/addons/report_intrastat/views/report_intrastat_views.xml
@@ -67,7 +67,7 @@
         </record>
 
         <menuitem action="action_report_intrastat_code_tree" id="menu_report_intrastat_code" 
-                parent="account.product_configuration_menu" sequence="10" groups="account.group_account_manager"/>
+                parent="account.account_account_menu" sequence="10" groups="account.group_account_manager"/>
 
 
         <record id="view_report_intrastat_tree" model="ir.ui.view">