diff --git a/addons/contacts/__init__.py b/addons/contacts/__init__.py
index 67dee8c60db..dc5e6b693d1 100644
--- a/addons/contacts/__init__.py
+++ b/addons/contacts/__init__.py
@@ -1,2 +1,4 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import models
diff --git a/addons/contacts/__manifest__.py b/addons/contacts/__manifest__.py
index 1df86af5667..5eef2f47a17 100644
--- a/addons/contacts/__manifest__.py
+++ b/addons/contacts/__manifest__.py
@@ -10,7 +10,7 @@
 This module gives you a quick view of your contacts directory, accessible from your home page.
 You can track your vendors, customers and other contacts.
 """,
-    'depends': ['base'],
+    'depends': ['base', 'mail'],
     'data': [
         'views/contact_views.xml',
     ],
diff --git a/addons/contacts/models/__init__.py b/addons/contacts/models/__init__.py
new file mode 100644
index 00000000000..74f3017f7e6
--- /dev/null
+++ b/addons/contacts/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import res_users
diff --git a/addons/contacts/models/res_users.py b/addons/contacts/models/res_users.py
new file mode 100644
index 00000000000..3a42daaa007
--- /dev/null
+++ b/addons/contacts/models/res_users.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, models, modules
+
+
+class Users(models.Model):
+    _name = 'res.users'
+    _inherit = ['res.users']
+
+    @api.model
+    def systray_get_activities(self):
+        """ Update the systray icon of res.partner activities to use the
+        contact application one instead of base icon. """
+        activities = super(Users, self).systray_get_activities()
+        for activity in activities:
+            if activity['model'] != 'res.partner':
+                continue
+            activity['icon'] = modules.module.get_module_icon('contacts')
+            activity['actions'] = [{
+                'icon': 'fa-clock-o',
+                'name': 'Summary',
+                'action_xmlid': 'contacts.action_contacts_summary'
+            }]
+        return activities
diff --git a/addons/contacts/views/contact_views.xml b/addons/contacts/views/contact_views.xml
index 82da7aaca6b..efedaa7b393 100644
--- a/addons/contacts/views/contact_views.xml
+++ b/addons/contacts/views/contact_views.xml
@@ -34,6 +34,22 @@
         <field name="act_window_id" ref="action_contacts"/>
     </record>
 
+    <record id="action_contacts_summary" model="ir.actions.act_window">
+        <field name="name">Contacts</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">res.partner</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">activity,kanban,tree,form</field>
+        <field name="search_view_id" ref="base.view_res_partner_filter"/>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                Create a contact in your address book
+            </p><p>
+                Odoo helps you to easily track all activities related to a customer.
+            </p>
+        </field>
+    </record>
+
     <menuitem name="Contacts"
         id="menu_contacts"
         sequence="4"
diff --git a/addons/mail/models/mail_activity.py b/addons/mail/models/mail_activity.py
index 234634863b5..78b4b005f77 100644
--- a/addons/mail/models/mail_activity.py
+++ b/addons/mail/models/mail_activity.py
@@ -408,16 +408,22 @@ class MailActivity(models.Model):
     def get_activity_data(self, res_model, domain):
         res = self.env[res_model].search(domain)
         activity_domain = [('res_id', 'in', res.ids), ('res_model', '=', res_model)]
-        grouped_activities = self.env['mail.activity'].read_group(activity_domain, ['res_id', 'activity_type_id', 'res_name:max(res_name)', 'ids:array_agg(id)', 'date_deadline:min(date_deadline)'], ['res_id', 'activity_type_id'], lazy=False)
+        grouped_activities = self.env['mail.activity'].read_group(
+            activity_domain,
+            ['res_id', 'activity_type_id', 'res_name:max(res_name)', 'ids:array_agg(id)', 'date_deadline:min(date_deadline)'],
+            ['res_id', 'activity_type_id'],
+            lazy=False)
         activity_type_ids = self.env['mail.activity.type']
-        res_list = set()
+        res_id_to_name = {}
+        res_id_to_deadline = {}
         activity_data = defaultdict(dict)
         for group in grouped_activities:
             res_id = group['res_id']
             res_name = group['res_name']
             activity_type_id = group['activity_type_id'][0]
             activity_type_ids |= self.env['mail.activity.type'].browse(activity_type_id)  # we will get the name when reading mail_template_ids
-            res_list.add((res_id, res_name))
+            res_id_to_name[res_id] = res_name
+            res_id_to_deadline[res_id] = group['date_deadline'] if (res_id not in res_id_to_deadline or group['date_deadline'] < res_id_to_deadline[res_id]) else res_id_to_deadline[res_id]
             state = self._compute_state_from_date(group['date_deadline'], self.user_id.sudo().tz)
             activity_data[res_id][activity_type_id] = {
                 'count': group['__count'],
@@ -426,6 +432,7 @@ class MailActivity(models.Model):
                 'state': state,
                 'o_closest_deadline': group['date_deadline'],
             }
+        res_ids_sorted = sorted(res_id_to_deadline, key=lambda item: res_id_to_deadline[item])
         activity_type_infos = []
         for elem in activity_type_ids:
             mail_template_info = []
@@ -435,7 +442,7 @@ class MailActivity(models.Model):
 
         return {
             'activity_types': activity_type_infos,
-            'res_ids': list(res_list),
+            'res_ids': [(rid, res_id_to_name[rid]) for rid in res_ids_sorted],
             'grouped_activities': activity_data,
             'model': res_model,
         }
diff --git a/addons/mail/static/src/js/systray/systray_activity_menu.js b/addons/mail/static/src/js/systray/systray_activity_menu.js
index cf052438749..4f0b5cff535 100644
--- a/addons/mail/static/src/js/systray/systray_activity_menu.js
+++ b/addons/mail/static/src/js/systray/systray_activity_menu.js
@@ -15,6 +15,7 @@ var ActivityMenu = Widget.extend({
     name: 'activity_menu',
     template:'mail.systray.ActivityMenu',
     events: {
+        'click .o_mail_activity_action': '_onActivityActionClick',
         'click .o_mail_preview': '_onActivityFilterClick',
         'show.bs.dropdown': '_onActivityMenuShow',
     },
@@ -98,6 +99,17 @@ var ActivityMenu = Widget.extend({
     // Handlers
     //------------------------------------------------------------
 
+    /**
+     * Redirect to specific action given its xml id
+     * @private
+     * @param {MouseEvent} ev
+     */
+    _onActivityActionClick: function (ev) {
+        ev.stopPropagation();
+        var actionXmlid = $(ev.currentTarget).data('action_xmlid');
+        this.do_action(actionXmlid);
+    },
+
     /**
      * Redirect to particular model view
      * @private
diff --git a/addons/mail/static/src/scss/activity_view.scss b/addons/mail/static/src/scss/activity_view.scss
index fb88d61e8b1..f1eda8ae86a 100644
--- a/addons/mail/static/src/scss/activity_view.scss
+++ b/addons/mail/static/src/scss/activity_view.scss
@@ -33,6 +33,7 @@
         color: #008784;
         &:hover {
             color: #666;
+            cursor: pointer;
         }
         cursor: pointer;
     }
diff --git a/addons/mail/static/src/scss/discuss.scss b/addons/mail/static/src/scss/discuss.scss
index bd702e1cec9..73207ac6d62 100644
--- a/addons/mail/static/src/scss/discuss.scss
+++ b/addons/mail/static/src/scss/discuss.scss
@@ -327,9 +327,19 @@
         .o_preview_title {
             display: flex;
             .o_preview_name {
-                flex: 0 1 auto;
+                flex: 0 0 auto;
                 @include o-text-overflow;
             }
+            .o_mail_activity_action_buttons {
+                display: flex;
+                flex: 1 1 auto;
+                flex-flow: row-reverse wrap;
+            }
+            .o_mail_activity_action {
+                padding-top: 0px;
+                padding-bottom: 0px;
+                padding-right: 0px;
+            }
             .o_preview_counter {
                 flex: 1 1 auto;
             }
diff --git a/addons/mail/static/src/xml/systray.xml b/addons/mail/static/src/xml/systray.xml
index 49d6095d647..95b7845ba16 100644
--- a/addons/mail/static/src/xml/systray.xml
+++ b/addons/mail/static/src/xml/systray.xml
@@ -78,6 +78,17 @@
                         <span class="o_preview_name">
                             <t t-esc="activity.name"/>
                         </span>
+                        <div t-if="activity.actions" class="o_mail_activity_action_buttons">
+                            <t t-foreach="activity.actions" t-as="action">
+                                <button type="button"
+                                    t-att-title="action.name"
+                                    t-att-class="'o_mail_activity_action btn btn-link fa ' + action.icon"
+                                    t-att-data-action_xmlid="action.action_xmlid"
+                                    t-att-data-res_model="activity.model"
+                                    t-att-data-model_name="activity.name">
+                                </button>
+                            </t>
+                        </div>
                     </div>
                     <div t-if="activity and activity.type == 'activity'">
                         <button t-if="activity.overdue_count" type="button" class="btn btn-link o_activity_filter_button mr16" t-att-data-res_model="activity.model" t-att-data-model_name="activity.name" data-filter='overdue'><t t-esc="activity.overdue_count"/> Late </button>
diff --git a/addons/note/static/src/scss/note.scss b/addons/note/static/src/scss/note.scss
index a1d4227e182..e7bc23fb855 100644
--- a/addons/note/static/src/scss/note.scss
+++ b/addons/note/static/src/scss/note.scss
@@ -37,6 +37,7 @@
             display: flex;
             p {
                 flex: 1 1 auto;
+                margin-bottom: 0px;
             }
         }
         .o_note_save {
@@ -60,4 +61,7 @@
             }
         }
     }
+    .o_note_set_datetime {
+        color: $text-muted;
+    }
 }
diff --git a/addons/note/static/src/xml/systray.xml b/addons/note/static/src/xml/systray.xml
index 56693a14544..8f0e953d94f 100644
--- a/addons/note/static/src/xml/systray.xml
+++ b/addons/note/static/src/xml/systray.xml
@@ -14,8 +14,8 @@
                         <span class="o_preview_name"><strong>Add a note</strong></span>
                         <div class="o_note_datetime"/>
                         <span class="ml4">
-                            <a class="o_note_set_datetime text-muted">
-                                <span class="fa fa-clock-o" role="img" aria-label="Set date and time" title="Set date and time"/>
+                            <a class="o_note_set_datetime">
+                                <span class="fa fa-calendar" role="img" aria-label="Set date and time" title="Set date and time"/>
                             </a>
                         </span>
                     </div>