diff --git a/addons/hr/models/hr.py b/addons/hr/models/hr.py
index 787287fe289..d0d5ff5af4b 100644
--- a/addons/hr/models/hr.py
+++ b/addons/hr/models/hr.py
@@ -126,7 +126,7 @@ class Employee(models.Model):
         ('divorced', 'Divorced')
     ], string='Marital Status')
     department_id = fields.Many2one('hr.department', string='Department')
-    address_id = fields.Many2one('res.partner', string='Working Address')
+    address_id = fields.Many2one('res.partner', string='Work Address')
     address_home_id = fields.Many2one('res.partner', string='Home Address')
     bank_account_id = fields.Many2one('res.partner.bank', string='Bank Account Number',
         domain="[('partner_id', '=', address_home_id)]", help='Employee bank salary account')
diff --git a/addons/hr/views/hr_views.xml b/addons/hr/views/hr_views.xml
index f13c33d035f..9c866f50faf 100644
--- a/addons/hr/views/hr_views.xml
+++ b/addons/hr/views/hr_views.xml
@@ -59,9 +59,9 @@
                                         <field name="address_id"
                                             context="{'show_address': 1}"
                                             options='{"always_reload": True, "highlight_first_line": True}'/>
-                                        <field name="mobile_phone"/>
                                         <field name="work_location"/>
                                         <field name="work_email" widget="email"/>
+                                        <field name="mobile_phone"/>
                                         <field name="work_phone"/>
                                     </group>
                                     <group string="Position">
@@ -98,7 +98,7 @@
                             </page>
                             <page string="HR Settings" groups="hr.group_hr_user">
                                 <group>
-                                    <group string='Status' name="active_group">
+                                    <group string='Attendance' name="active_group">
                                         <field name="company_id" groups="base.group_multi_company"/>
                                         <field name="user_id" string="Related User"/>
                                     </group>
diff --git a/addons/hr_attendance/report/hr_employee_badge.xml b/addons/hr_attendance/report/hr_employee_badge.xml
index 902131334b0..d1a6c78645a 100644
--- a/addons/hr_attendance/report/hr_employee_badge.xml
+++ b/addons/hr_attendance/report/hr_employee_badge.xml
@@ -4,7 +4,7 @@
         id="hr_employee_print_badge"
         string="Print Badge"
         model="hr.employee"
-        report_type="qweb-html"
+        report_type="qweb-pdf"
         name="hr_attendance.print_employee_badge"
         file="hr_attendance.print_employee_badge"/>
     <record id="hr_employee_print_badge" model="ir.actions.report.xml">
diff --git a/addons/hr_attendance/static/src/less/hr_attendance.less b/addons/hr_attendance/static/src/less/hr_attendance.less
index 12a356159d4..66195e3d6c1 100644
--- a/addons/hr_attendance/static/src/less/hr_attendance.less
+++ b/addons/hr_attendance/static/src/less/hr_attendance.less
@@ -9,15 +9,15 @@
 
 .oe_hr_attendance_status {
     font-size: 1.2em;
-    margin-right: .3em;
+    margin-right: .1em;
     display: inline-block;
     color: @odoo-brand-secondary;
 
     &.oe_hr_attendance_status_green {
-        color: @brand-success;
+        color: @brand-success !important;
     }
     &.oe_hr_attendance_status_red {
-        color: @brand-danger;
+        color: @brand-danger !important;
     }
 }
 
diff --git a/addons/hr_attendance/views/hr_attendance_view.xml b/addons/hr_attendance/views/hr_attendance_view.xml
index 569c3c9f6ea..d246b247422 100644
--- a/addons/hr_attendance/views/hr_attendance_view.xml
+++ b/addons/hr_attendance/views/hr_attendance_view.xml
@@ -92,6 +92,17 @@
         </field>
     </record>
 
+    <record id="hr_attendance_action_employee" model="ir.actions.act_window">
+        <field name="name">Attendances</field>
+        <field name="res_model">hr.attendance</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="context">{'search_default_employee_id': active_id, 'default_employee_id': active_id}</field>
+        <field name="help" type="html">
+            <p>No attendance records to display.</p>
+        </field>
+    </record>
+
     <record id="hr_attendance_action_graph" model="ir.actions.act_window">
         <field name="name">Attendance Analysis</field>
         <field name="res_model">hr.attendance</field>
diff --git a/addons/hr_attendance/views/hr_employee_view.xml b/addons/hr_attendance/views/hr_employee_view.xml
index 48e8d6ee1b2..52cbd6c6bfe 100644
--- a/addons/hr_attendance/views/hr_employee_view.xml
+++ b/addons/hr_attendance/views/hr_employee_view.xml
@@ -9,18 +9,39 @@
         <field name="arch" type="xml">
             <field name="name" position="replace">
             <div id="textbox">
-                    <field name="attendance_state" widget="hr_attendance_form_presence_indicator"/>
                     <field name="name" placeholder="Employee's Name"/>
             </div>
             </field>
             <field name="user_id" position="after">
                 <field name="barcode" groups="hr_attendance.group_hr_attendance_user"/>
-                <field name="pin" groups="hr_attendance.group_hr_attendance_user,hr_attendance.group_hr_attendance_use_pin"/>
-                <field name="manual_attendance" groups="hr_attendance.group_hr_attendance_user"/>
+                <field name="pin" groups="hr_attendance.group_hr_attendance_use_pin"/>
+                <field name="manual_attendance" groups="hr_attendance.group_hr_attendance_user" attrs="{'invisible': [('user_id', '=', False)]}"/>
             </field>
         </field>
     </record>
 
+    <record id="view_employee_form_inherit_hr_attendance_stat" model="ir.ui.view">
+        <field name="name">hr.employee.inherit</field>
+        <field name="model">hr.employee</field>
+        <field name="inherit_id" ref="hr.view_employee_form"/>
+        <field name="arch" type="xml">
+            <data>
+                <xpath expr="//button[@name='toggle_active']" position="before">
+                    <field name="attendance_state" invisible="1"/>
+                    <button name="%(hr_attendance_action_employee)d"
+                        class="oe_stat_button"
+                        type="action" attrs="{'invisible': [('attendance_state', '=', False)]}">
+                        <div class="fa fa-fw fa-user o_button_icon oe_hr_attendance_status oe_hr_attendance_status_green" attrs="{'invisible': [('attendance_state', '=', 'checked_out')]}"/>
+                        <div class="fa fa-fw fa-user o_button_icon oe_hr_attendance_status oe_hr_attendance_status_red" attrs="{'invisible': [('attendance_state', '=', 'checked_in')]}"/>
+                        <div class="o_stat_info">
+                            <span class="o_stat_text">Attendance</span>
+                        </div>
+                    </button>
+                </xpath>
+            </data>
+        </field>
+    </record>
+
     <!-- employee kanban view specifically for hr_attendance (to check in/out) -->
     <record id="hr_employees_view_kanban" model="ir.ui.view">
         <field name="name">hr.employee.kanban</field>
diff --git a/addons/hr_contract/views/hr_contract_views.xml b/addons/hr_contract/views/hr_contract_views.xml
index 7e2c77e8992..f54ecce28c7 100644
--- a/addons/hr_contract/views/hr_contract_views.xml
+++ b/addons/hr_contract/views/hr_contract_views.xml
@@ -108,11 +108,12 @@
                                 <group name="duration_group" string="Duration">
                                     <label for="trial_date_start" string="Trial Period Duration"/>
                                     <div>
-                                        <field name="trial_date_start" class="oe_inline"/> - <field name="trial_date_end" class="oe_inline"/>
+                                        <field name="trial_date_start" class="oe_inline"/>
+                                        <span attrs="{'invisible': ['|', ('trial_date_start', '=', False), ('trial_date_end', '=', False)]}"> - </span><field name="trial_date_end" class="oe_inline"/>
                                     </div>
                                     <label for="date_start" string="Duration"/>
                                     <div>
-                                        <field name="date_start" class="oe_inline"/> - <field name="date_end" class="oe_inline"/>
+                                        <field name="date_start" class="oe_inline"/><span attrs="{'invisible': ['|', ('date_start', '=', False), ('date_end', '=', False)]}"> - </span><field name="date_end" class="oe_inline"/>
                                     </div>
                                     <field name="working_hours"/>
                                 </group>
diff --git a/addons/hr_payroll/views/hr_payroll_views.xml b/addons/hr_payroll/views/hr_payroll_views.xml
index 1a33289af86..55600f3f27b 100644
--- a/addons/hr_payroll/views/hr_payroll_views.xml
+++ b/addons/hr_payroll/views/hr_payroll_views.xml
@@ -390,7 +390,7 @@
                             class="oe_stat_button"
                             icon="fa-money"
                             type="action"
-                            groups="hr.group_hr_user">
+                            groups="hr_payroll.group_hr_payroll_user">
                             <field name="payslip_count" widget="statinfo" string="Payslips"/>
                         </button>
                     </button>