diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py
index 93f5ed9c8eb..4f794c55a83 100644
--- a/addons/hr/res_config.py
+++ b/addons/hr/res_config.py
@@ -23,7 +23,7 @@ from osv import fields, osv
 from lxml import etree
 
 class human_resources_configuration(osv.osv_memory):
-    _name = 'human.resources.configuration'
+    _name = 'hr.config.settings'
     _inherit = 'res.config.settings'
 
     _columns = {
diff --git a/addons/hr/res_config_view.xml b/addons/hr/res_config_view.xml
index a19520438e7..ee90372f22d 100644
--- a/addons/hr/res_config_view.xml
+++ b/addons/hr/res_config_view.xml
@@ -9,8 +9,8 @@
         </record>
 
         <record id="view_human_resources_configuration" model="ir.ui.view">
-            <field name="name">Human Resources Application</field>
-            <field name="model">human.resources.configuration</field>
+            <field name="name">hr settings</field>
+            <field name="model">hr.config.settings</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <form string ="HR Application">
@@ -32,18 +32,19 @@
                         <field name="module_hr_evaluation"/>
                         <field name="module_hr_contract"/>
                     </group>
-                    
+                    <label colspan="2"/>
+                    <button string="Cancel" icon="gtk-cancel" special="cancel"/>
+                    <button string="Apply" icon="gtk-apply" type="object" name="execute"/>
                 </form>
             </field>
         </record>
 
         <record id="action_human_resources_configuration" model="ir.actions.act_window">
             <field name="name">Configure Human Resources Application</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">human.resources.configuration</field>
+            <field name="res_model">hr.config.settings</field>
             <field name="view_id" ref="view_human_resources_configuration"/>
-            <field name="view_type">form</field>
             <field name="view_mode">form</field>
+            <field name="target">inline</field>
         </record>
 
         <menuitem id="menu_human_resources_configuration" name="Human Resources" parent="base.menu_config" sequence="8" action="action_human_resources_configuration"/>
diff --git a/addons/hr_evaluation/hr_evaluation_installer.xml b/addons/hr_evaluation/hr_evaluation_installer.xml
index 711f1f44306..1055ca77b98 100644
--- a/addons/hr_evaluation/hr_evaluation_installer.xml
+++ b/addons/hr_evaluation/hr_evaluation_installer.xml
@@ -18,8 +18,8 @@
         <!-- Hr Configuration wizard -->
 
         <record id="view_evaluation_config_wizard_inherit" model="ir.ui.view">
-            <field name="name">human.evaluation.resources.configuration.form.inherit</field>
-            <field name="model">human.resources.configuration</field>
+            <field name="name">hr settings for evaluations</field>
+            <field name="model">hr.config.settings</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
diff --git a/addons/hr_expense/hr_expense_installer_view.xml b/addons/hr_expense/hr_expense_installer_view.xml
index 58682dd3959..b5d0a11251e 100644
--- a/addons/hr_expense/hr_expense_installer_view.xml
+++ b/addons/hr_expense/hr_expense_installer_view.xml
@@ -36,8 +36,8 @@
         <!-- Hr Configuration wizard -->
 
         <record id="view_expenseconfig_wizard_inherit" model="ir.ui.view">
-            <field name="name">human.expense.resources.configuration.form.inherit</field>
-            <field name="model">human.resources.configuration</field>
+            <field name="name">hr settings for expenses</field>
+            <field name="model">hr.config.settings</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 44558edc79c..e11caf8eb0c 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -493,8 +493,8 @@
         <!-- Hr Configuration wizard -->
 
         <record id="view_config_wizard_inherit" model="ir.ui.view">
-            <field name="name">human.resources.configuration.form.inherit</field>
-            <field name="model">human.resources.configuration</field>
+            <field name="name">hr settings for holidays</field>
+            <field name="model">hr.config.settings</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
diff --git a/addons/hr_payroll/res_config.py b/addons/hr_payroll/res_config.py
index 770656247d6..b1523e460b1 100644
--- a/addons/hr_payroll/res_config.py
+++ b/addons/hr_payroll/res_config.py
@@ -22,7 +22,7 @@
 from osv import osv, fields
 
 class human_resources_configuration(osv.osv_memory):
-    _inherit = 'human.resources.configuration'
+    _inherit = 'hr.config.settings'
     _columns = {
             'module_hr_payroll_account': fields.boolean('Manage Account Payroll',
                            help ="""It installs the hr_payroll_account module."""),
diff --git a/addons/hr_payroll/res_config_view.xml b/addons/hr_payroll/res_config_view.xml
index 3fe3981c581..e380622943d 100644
--- a/addons/hr_payroll/res_config_view.xml
+++ b/addons/hr_payroll/res_config_view.xml
@@ -2,8 +2,8 @@
 <openerp>
     <data>
         <record id="view_hr_config_inherit" model="ir.ui.view">
-            <field name="name">Account Payroll Application</field>
-            <field name="model">human.resources.configuration</field>
+            <field name="name">hr settings for payroll</field>
+            <field name="model">hr.config.settings</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
diff --git a/addons/hr_recruitment/res_config.py b/addons/hr_recruitment/res_config.py
index 6da454b8d5f..b4ade57e383 100644
--- a/addons/hr_recruitment/res_config.py
+++ b/addons/hr_recruitment/res_config.py
@@ -22,8 +22,8 @@
 from osv import osv, fields
 
 class hr_applicant_settings(osv.osv_memory):
-    _name = 'human.resources.configuration'
-    _inherit = ['human.resources.configuration', 'fetchmail.config.settings']
+    _name = 'hr.config.settings'
+    _inherit = ['hr.config.settings', 'fetchmail.config.settings']
 
     _columns = {
         'fetchmail_applicants': fields.boolean('Create Applicants from an email account',
diff --git a/addons/hr_recruitment/res_config_view.xml b/addons/hr_recruitment/res_config_view.xml
index da3ea78718e..2d0c2e01728 100644
--- a/addons/hr_recruitment/res_config_view.xml
+++ b/addons/hr_recruitment/res_config_view.xml
@@ -3,8 +3,8 @@
     <data>
 
         <record id="view_hr_apll_config_settings" model="ir.ui.view">
-            <field name="name">Human Resources Application</field>
-            <field name="model">human.resources.configuration</field>
+            <field name="name">hr settings for recruitment</field>
+            <field name="model">hr.config.settings</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">
diff --git a/addons/hr_timesheet_sheet/res_config.py b/addons/hr_timesheet_sheet/res_config.py
index 9e01f74a257..8b7b411636f 100644
--- a/addons/hr_timesheet_sheet/res_config.py
+++ b/addons/hr_timesheet_sheet/res_config.py
@@ -22,8 +22,7 @@
 from osv import osv, fields
 import pooler
 class hr_timeshee_settings(osv.osv_memory):
-    _name = 'human.resources.configuration'
-    _inherit = 'human.resources.configuration'
+    _inherit = 'hr.config.settings'
 
     _columns = {
         'timesheet_range': fields.selection(
diff --git a/addons/hr_timesheet_sheet/res_config_view.xml b/addons/hr_timesheet_sheet/res_config_view.xml
index 2c856a19ac5..fe0cfd46024 100644
--- a/addons/hr_timesheet_sheet/res_config_view.xml
+++ b/addons/hr_timesheet_sheet/res_config_view.xml
@@ -3,8 +3,8 @@
     <data>
 
         <record id="view_hr_timehseet_config_settings" model="ir.ui.view">
-            <field name="name">Human Resources Application</field>
-            <field name="model">human.resources.configuration</field>
+            <field name="name">hr settings for timesheets</field>
+            <field name="model">hr.config.settings</field>
             <field name="type">form</field>
             <field name="inherit_id" ref="hr.view_human_resources_configuration"/>
             <field name="arch" type="xml">