diff --git a/addons/hr/views/hr_employee_views.xml b/addons/hr/views/hr_employee_views.xml
index d2df1ea82f4..cf7dd19cff0 100644
--- a/addons/hr/views/hr_employee_views.xml
+++ b/addons/hr/views/hr_employee_views.xml
@@ -178,7 +178,6 @@
                                 <group>
                                     <group string='Status' name="active_group">
                                         <field name="user_id" string="Related User" domain="[('share', '=', False)]"/>
-                                        <field name="job_id"/>
                                     </group>
                                     <group string="Attendance" name="identification_group">
                                         <field name="pin" string="PIN Code"/>
@@ -189,6 +188,10 @@
                                             <button name="%(hr_employee_print_badge)d" string="Print Badge" class="btn btn-link" type="action" attrs="{'invisible': [('barcode', '=', False)]}"/>
                                         </div>
                                     </group>
+                                    <group string='Payroll' name="payroll_group">
+                                        <field name="job_id"/>
+                                    </group>
+                                    <group name="application_group"/>
                                 </group>
                             </page>
                         </notebook>
diff --git a/addons/hr_fleet/views/employee_views.xml b/addons/hr_fleet/views/employee_views.xml
index 67ead3b115a..8df6f178e8b 100644
--- a/addons/hr_fleet/views/employee_views.xml
+++ b/addons/hr_fleet/views/employee_views.xml
@@ -19,11 +19,12 @@
                     <field name="employee_cars_count" widget="statinfo" />
                 </button>
             </div>
-            <xpath expr="//group[@name='identification_group']" position="after">
-                <group string="Fleet">
-                    <field name="mobility_card"/>
-                </group>
-            </xpath>
+            <group name="application_group" position="attributes">
+                <attribute name="string">Application Settings</attribute>
+            </group>
+            <group name="application_group" position="inside">
+                <field name="mobility_card" string="Fleet Mobility Card"/>
+            </group>
         </field>
     </record>
 
diff --git a/addons/hr_timesheet/views/hr_views.xml b/addons/hr_timesheet/views/hr_views.xml
index 19aaf29bc92..1dea398c208 100644
--- a/addons/hr_timesheet/views/hr_views.xml
+++ b/addons/hr_timesheet/views/hr_views.xml
@@ -32,17 +32,16 @@
         <field name="model">hr.employee</field>
         <field name="inherit_id" ref="hr.view_employee_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//page[@name='hr_settings']" position="inside">
-                <group>
-                    <group string="Timesheets" name="timesheet" groups="hr_timesheet.group_timesheet_manager">
-                        <label for="timesheet_cost"/>
-                        <div>
-                            <field name="timesheet_cost" class="oe_inline"/> per hour
-                            <field name="currency_id" invisible="1"/>
-                        </div>
-                    </group>
-                </group>
-            </xpath>
+            <group name="application_group" position="attributes">
+                <attribute name="string">Application Settings</attribute>
+            </group>
+            <group name="application_group" position="inside">
+                <label for="timesheet_cost" groups="hr_timesheet.group_timesheet_manager"/>
+                <div name="timesheet" groups="hr_timesheet.group_timesheet_manager">
+                    <field name="timesheet_cost" class="oe_inline"/> per hour
+                    <field name="currency_id" invisible="1"/>
+                </div>
+            </group>
             <div name="button_box" position="inside">
                 <button class="oe_stat_button" type="action" name="%(timesheet_action_from_employee)d" icon="fa-calendar" groups="hr_timesheet.group_hr_timesheet_user">
                     <div class="o_stat_info">