diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index a7c084cf18c..d257c6d5d2e 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -291,7 +291,7 @@ class hr_employee(osv.osv):
         :return: the result of message_post from mail_thread, last call if
         several messages are sent.
         """
-        
+
         if 'res_users_id' in context and context['default_res_id'] == 0:
             employee_ids = self.search(cr, uid, [('user_id', '=', context['res_users_id'])], context=context)
             if len(employee_ids) > 0:
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index b3f8628ccc1..4ccb4425f2d 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -85,11 +85,12 @@
                                 </group>
                             </page>
                         </notebook>
-                        <div class="oe_chatter">
-                            <field name="message_follower_ids" widget="mail_followers"/>
-                            <field name="message_ids" widget="mail_thread"/>
-                        </div>
+                        
                     </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
                 </form>
             </field>
         </record>
@@ -159,9 +160,12 @@
                                     <li t-if="record.work_location.raw_value"><field name="work_location"/></li>
                                     <li t-if="record.work_email.raw_value"><a t-attf-href="mailto:#{record.work_email.value}"><field name="work_email"/></a></li>
                                 </ul>
-                                <div class="oe_group_button">
-                                    <button t-if="record.message_is_follower.raw_value" name="action_unfollow" type="object" class="oe_group_join">Unfollow</button>
-                                    <button t-if="! record.message_is_follower.raw_value" name="action_follow" type="object">Follow</button>
+                                <div class="oe_followers">
+                                    <button t-if="record.message_is_follower.raw_value" name="action_unfollow" type="object" class="oe_follower oe_following">
+                                        <span class="oe_unfollow">Unfollow</span>
+                                        <span class="oe_following">Following</span>
+                                    </button>
+                                    <button t-if="! record.message_is_follower.raw_value" name="action_follow" type="object" class="oe_follower oe_notfollow">Follow</button>
                                 </div>
                             </div>
                         </div>
diff --git a/addons/hr/static/src/css/hr.css b/addons/hr/static/src/css/hr.css
index 16657394736..be21ca7e7a6 100644
--- a/addons/hr/static/src/css/hr.css
+++ b/addons/hr/static/src/css/hr.css
@@ -68,3 +68,8 @@
   margin: 2px 0;
   padding: 0;
 }
+
+.openerp .oe_employee_vignette .oe_followers {
+  width: auto;
+  float: none;
+}
\ No newline at end of file