diff --git a/addons/account_check_writing/account_view.xml b/addons/account_check_writing/account_view.xml
index 2b065a2afee..13b3b820226 100644
--- a/addons/account_check_writing/account_view.xml
+++ b/addons/account_check_writing/account_view.xml
@@ -31,11 +31,11 @@
             <field name="priority">17</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
-                    <separator string="Default Check Layout" colspan="4"/>
-                    <field name="check_layout"/>
-                    <newline/>
-                </page>
+                <xpath expr="//group[@name='currency']" position="after">
+                    <group string="Default Check Layout">
+                        <field name="check_layout"/>
+                    </group>
+                </xpath>
             </field>
        </record>
     </data>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index c43b1206541..f05c1b7f9be 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -196,12 +196,12 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
-                    <separator string="Timesheets" colspan="4"/>
-                    <field name="timesheet_range"/>
-                    <field name="timesheet_max_difference"/>
-                    <newline/>
-                </page>
+                <xpath expr="//group[@name='currency']" position="after">
+                    <group string="Timesheets">
+                        <field name="timesheet_range"/>
+                        <field name="timesheet_max_difference"/>
+                    </group>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/l10n_ch/company_view.xml b/addons/l10n_ch/company_view.xml
index 0d107f63723..1897c894462 100644
--- a/addons/l10n_ch/company_view.xml
+++ b/addons/l10n_ch/company_view.xml
@@ -7,8 +7,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <field name="rml_footer2" position="after">
-                <newline/>
+                <xpath expr="//div[@name='bank_acc']" position="after">
                     <group string="BVR data" colspan="4">
                         <field name="bvr_delta_horz"/>
                         <field name="bvr_delta_vert"/>
@@ -20,8 +19,7 @@
                         <field name="bvr_only"/>
                         <field name="invoice_only"/>
                     </group>
-                <newline/>
-                </field>
+                </xpath>
             </field>
         </record>
     </data>
diff --git a/addons/mrp/company_view.xml b/addons/mrp/company_view.xml
index bb342ccde41..d7e518699e0 100644
--- a/addons/mrp/company_view.xml
+++ b/addons/mrp/company_view.xml
@@ -9,11 +9,9 @@
             <field name="priority">22</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
-                    <group>
+                <xpath expr="//field[@name='currency_id']" position="after">
                         <field name="manufacturing_lead"/>
-                    </group>
-                </page>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/pad/res_company.xml b/addons/pad/res_company.xml
index 20b6f52d853..8f65c507c61 100644
--- a/addons/pad/res_company.xml
+++ b/addons/pad/res_company.xml
@@ -6,9 +6,10 @@
       <field name="type">form</field>
       <field name="inherit_id" ref="base.view_company_form"/>
       <field name="arch" type="xml">
-        <xpath expr="//page[@string='Configuration']" position="inside">
-          <separator string="Pad" colspan="4"/>
-          <field name="pad_url_template"/>
+        <xpath expr="//group[@name='currency']" position="after">
+          <group string="Pad">
+            <field name="pad_url_template"/>
+          </group>
         </xpath>
       </field>
     </record>
diff --git a/addons/procurement/company_view.xml b/addons/procurement/company_view.xml
index 4d14f69edde..49e50f8c0f2 100644
--- a/addons/procurement/company_view.xml
+++ b/addons/procurement/company_view.xml
@@ -9,10 +9,11 @@
             <field name="priority">17</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
-                    <separator string="MRP &amp; Logistics Scheduler" colspan="4"/>
-                    <field name="schedule_range"/>
-                </page>
+                <xpath expr="//group[@name='currency']" position="after">
+                    <group string="MRP &amp; Logistics Scheduler">
+                        <field name="schedule_range"/>
+                    </group>
+                </xpath>
             </field>
        </record>
     
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index e58aad743dd..6c5ffd998fa 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -739,11 +739,11 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
+                <xpath expr="//group[@name='currency']" position="after">
                     <group string="Project Management">
                         <field name="project_time_mode_id" domain="[('category_id','=','Working Time')]"/>
                     </group>
-                </page>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/purchase/company_view.xml b/addons/purchase/company_view.xml
index 08637ba362d..9e935fe34fe 100644
--- a/addons/purchase/company_view.xml
+++ b/addons/purchase/company_view.xml
@@ -9,11 +9,9 @@
             <field name="priority">19</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
-                    <group>
+                <xpath expr="//field[@name='currency_id']" position="after">
                         <field name="po_lead"/>
-                    </group>
-                </page>
+                </xpath>
             </field>
         </record>
 
diff --git a/addons/sale/company_view.xml b/addons/sale/company_view.xml
index 96ff91e8e90..73f67707ce6 100644
--- a/addons/sale/company_view.xml
+++ b/addons/sale/company_view.xml
@@ -8,9 +8,9 @@
             <field name="priority">24</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <page string="Configuration" position="inside">
-                    <field name="security_lead"/>
-                </page>
+                <xpath expr="//field[@name='currency_id']" position="after">
+                   <field name="security_lead"/>
+                </xpath>
             </field>
         </record>
     </data>
diff --git a/addons/users_ldap/users_ldap_view.xml b/addons/users_ldap/users_ldap_view.xml
index 40d01f43bf3..3664f735836 100644
--- a/addons/users_ldap/users_ldap_view.xml
+++ b/addons/users_ldap/users_ldap_view.xml
@@ -7,7 +7,7 @@
             <field name="type">form</field>
             <field name="inherit_id" ref="base.view_company_form"/>
             <field name="arch" type="xml">
-                <xpath expr="//page[@string='Configuration']" position="inside">
+                <xpath expr="//group[@name='currency']" position="after">
                     <field name="ldaps" nolabel="1" colspan="4">
                         <form string="LDAP Configuration" version="7.0">
                             <group col="4">