diff --git a/addons/crm/views/crm_team_views.xml b/addons/crm/views/crm_team_views.xml
index 7b007b8a531..23698ecc36c 100644
--- a/addons/crm/views/crm_team_views.xml
+++ b/addons/crm/views/crm_team_views.xml
@@ -242,4 +242,8 @@
             </field>
         </record>
 
+        <record id="sales_team.mail_activity_type_action_config_sales" model="ir.actions.act_window">
+            <field name="domain">['|', ('res_model_id', '=', False), ('res_model_id.model', 'in', ['crm.lead', 'res.partner'])]</field>
+        </record>
+
 </odoo>
diff --git a/addons/mail/views/mail_activity_views.xml b/addons/mail/views/mail_activity_views.xml
index 388f64e1b16..74e9185a534 100644
--- a/addons/mail/views/mail_activity_views.xml
+++ b/addons/mail/views/mail_activity_views.xml
@@ -12,7 +12,7 @@
                     </div>
                     <group>
                         <group>
-                            <field name="res_model_id"/>
+                            <field name="res_model_id" groups="base.group_no_one"/>
                             <field name="icon" groups="base.group_no_one"/>
                             <field name="days"/>
                         </group>
diff --git a/addons/mail/views/res_config_views.xml b/addons/mail/views/res_config_views.xml
index ea8ebacf725..732b7df0497 100644
--- a/addons/mail/views/res_config_views.xml
+++ b/addons/mail/views/res_config_views.xml
@@ -7,8 +7,22 @@
             <field name="inherit_id" ref="base_setup.base_config_settings_view_form"/>
             <field name="arch" type="xml">
                 <div id="emails" position='replace'>
-                    <h2>Emails</h2>
+                    <h2>Discuss</h2>
                     <div class="row mt16 o_settings_container" id="emails">
+                        <div class="col-xs-12 col-md-6 o_setting_box">
+                            <div class="o_setting_left_pane"/>
+                            <div class="o_setting_right_pane">
+                                <label string="Activities"/>
+                                <div class="text-muted">
+                                    Configure your activity types
+                                </div>
+                                <div class="content-group">
+                                    <div class="mt16">
+                                        <button name="%(mail.mail_activity_type_action)d" string="Activity Types" type="action" class="oe_link" icon="fa-arrow-right"/>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
                         <div class="col-xs-12 col-md-6 o_setting_box" title="Using your own email server is required to send/receive emails in Community and Enterprise versions. Online users already benefit from a ready-to-use email server (@mycompany.odoo.com).">
                             <div class="o_setting_left_pane">
                                 <field name="default_external_email_server"/>
diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml
index 08f3b80c8c7..eeba7d224cc 100644
--- a/addons/project/views/project_views.xml
+++ b/addons/project/views/project_views.xml
@@ -631,6 +631,18 @@ action = model.activate_sample_project()
             action="project_task_action_activity"
             sequence="25"/>
 
+        <!-- Activity types config -->
+        <record id="mail_activity_type_action_config_project_types" model="ir.actions.act_window">
+            <field name="name">Activity Types</field>
+            <field name="res_model">mail.activity.type</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">['|', ('res_model_id', '=', False), ('res_model_id.model', '=', 'project.task')]</field>
+        </record>
+        <menuitem id="project_menu_config_activity_type"
+            action="mail_activity_type_action_config_project_types"
+            parent="menu_project_config"/>
+
         <record id="action_view_task_overpassed_draft" model="ir.actions.act_window">
             <field name="name">Overpassed Tasks</field>
             <field name="res_model">project.task</field>
diff --git a/addons/project_issue/views/project_issue_views.xml b/addons/project_issue/views/project_issue_views.xml
index 5eb5e5b7170..78e04595e22 100644
--- a/addons/project_issue/views/project_issue_views.xml
+++ b/addons/project_issue/views/project_issue_views.xml
@@ -372,4 +372,8 @@
             parent="project.menu_project_management"
             action="project_issue_action_activity"
             sequence="25"/>
+
+        <record id="project.mail_activity_type_action_config_project_types" model="ir.actions.act_window">
+            <field name="domain">['|', ('res_model_id', '=', False), ('res_model_id.model', 'in', ['project.task', 'project.issue'])]</field>
+        </record>
 </odoo>
diff --git a/addons/sale/views/sales_team_views.xml b/addons/sale/views/sales_team_views.xml
index b10d6b55764..c1fec1d76d4 100644
--- a/addons/sale/views/sales_team_views.xml
+++ b/addons/sale/views/sales_team_views.xml
@@ -137,4 +137,8 @@
         </field>
     </record>
 
+    <record id="sales_team.mail_activity_type_action_config_sales" model="ir.actions.act_window">
+        <field name="domain">['|', ('res_model_id', '=', False), ('res_model_id.model', 'in', ['sale.order', 'res.partner', 'product.template', 'product.product'])]</field>
+    </record>
+
 </odoo>
diff --git a/addons/sale_crm/views/crm_lead_views.xml b/addons/sale_crm/views/crm_lead_views.xml
index a85f89b796a..2f3f7883fe7 100644
--- a/addons/sale_crm/views/crm_lead_views.xml
+++ b/addons/sale_crm/views/crm_lead_views.xml
@@ -45,4 +45,8 @@
             <field name="context">{'default_type': 'opportunity', 'default_user_id': uid, 'needaction_menu_ref': 'sale.menu_sale_quotations'}</field>
         </record>
 
+        <record id="sales_team.mail_activity_type_action_config_sales" model="ir.actions.act_window">
+            <field name="domain">['|', ('res_model_id', '=', False), ('res_model_id.model', 'in', ['crm.lead', 'sale.order', 'res.partner', 'product.template', 'product.product'])]</field>
+        </record>
+
 </odoo>
diff --git a/addons/sales_team/views/crm_team_views.xml b/addons/sales_team/views/crm_team_views.xml
index a6deb5ac49d..cab20d5b5fc 100644
--- a/addons/sales_team/views/crm_team_views.xml
+++ b/addons/sales_team/views/crm_team_views.xml
@@ -196,5 +196,18 @@
             parent="sales_team.menu_sale_config"
             action="sales_team_config_action"/>
 
+        <record id="mail_activity_type_action_config_sales" model="ir.actions.act_window">
+            <field name="name">Activity Types</field>
+            <field name="res_model">mail.activity.type</field>
+            <field name="view_type">form</field>
+            <field name="view_mode">tree,form</field>
+            <field name="domain">['|', ('res_model_id', '=', False), ('res_model_id.model', '=', 'res.partner')]</field>
+        </record>
+        <menuitem name="Activity Types"
+            id="sales_team_menu_config_activity_types"
+            sequence="2"
+            action="mail_activity_type_action_config_sales"
+            parent="sales_team.menu_sale_config"/>
+
     </data>
 </odoo>