diff --git a/addons/document_ics/document_ics_config_wizard.py b/addons/document_ics/document_ics_config_wizard.py
index ea6bef3d842..c669df33f3e 100644
--- a/addons/document_ics/document_ics_config_wizard.py
+++ b/addons/document_ics/document_ics_config_wizard.py
@@ -50,6 +50,8 @@ ICS_TAGS = {
 
 class document_ics_crm_wizard(osv.osv_memory):
     _name='document.ics.crm.wizard'
+    _inherit = 'res.config'
+
     _columns = {
         'name':fields.char('Name', size=64),
         'meeting' : fields.boolean('Calendar of Meetings', help="Manages the calendar of meetings of the users."),
@@ -69,7 +71,7 @@ class document_ics_crm_wizard(osv.osv_memory):
         'phonecall': lambda *args: True,
     }
 
-    def action_create(self, cr, uid, ids, context=None):
+    def execute(self, cr, uid, ids, context=None):
         data=self.read(cr, uid, ids, [])[0]
         dir_obj = self.pool.get('document.directory')
         dir_cont_obj = self.pool.get('document.directory.content')
@@ -110,23 +112,6 @@ class document_ics_crm_wizard(osv.osv_memory):
                                 'content_id': content_id ,
                                   }
                         ics_obj.create(cr, uid, vals_ics)
-
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-         }
-    def action_cancel(self, cr, uid, ids, conect=None):
-        return {
-                'view_type': 'form',
-                "view_mode": 'form',
-                'res_model': 'ir.actions.configuration.wizard',
-                'type': 'ir.actions.act_window',
-                'target':'new',
-         }
-
 document_ics_crm_wizard()
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/document_ics/document_ics_config_wizard.xml b/addons/document_ics/document_ics_config_wizard.xml
index 9c2132bc89d..c77fa15c2a8 100644
--- a/addons/document_ics/document_ics_config_wizard.xml
+++ b/addons/document_ics/document_ics_config_wizard.xml
@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
-    
-	<record id="view_document_ics_config_directories" model="ir.ui.view">
+        <record id="view_document_ics_config_directories" model="ir.ui.view">
             <field name="name">Configure Calendars for Sections</field>
             <field name="model">document.ics.crm.wizard</field>
             <field name="type">form</field>
+            <field name="inherit_id" ref="base.res_config_view_base"/>
             <field name="arch" type="xml">
-                <form string="Configure Calendars for CRM Sections">
-                    <separator colspan="4" string="Create Pre-Configured Calendars"/>
-                    <newline/>
-                    <field name="meeting"/>
-                    <field name="opportunity"/>
-                    <field name="phonecall"/>
-                    <field name="lead"/>
-                    <field name="claims"/>
-                    <field name="bugs"/>
-                    <field name="helpdesk"/>
-                    <field name="jobs"/>
-                    <field name="fund"/>
-                    <newline/>
-                    <group col="4" colspan="4">
-                        <button icon="gtk-cancel" name="action_cancel" type="object" special="cancel" string="Cancel"/>
-                        <button icon="gtk-go-forward" name="action_create" string="Next" type="object"/>
-                    </group>
-                </form>
+              <data>
+                <form position="attributes"><attribute name="string">
+                  Configure Calendars for CRM Sections
+                </attribute></form>
+                <group string="res_config_contents" position="replace">
+                  <separator string="Create Pre-Configured Calendars"
+                             colspan="4"/>
+                  <newline/>
+                  <field name="meeting"/>
+                  <field name="opportunity"/>
+                  <field name="phonecall"/>
+                  <field name="lead"/>
+                  <field name="claims"/>
+                  <field name="bugs"/>
+                  <field name="helpdesk"/>
+                  <field name="jobs"/>
+                  <field name="fund"/>
+                </group>
+              </data>
             </field>
         </record>
 
@@ -32,19 +33,16 @@
             <field name="name">Configure Calendars for Sections </field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">document.ics.crm.wizard</field>
+            <field name="view_id" ref="view_document_ics_config_directories"/>
             <field name="view_type">form</field>
             <field name="view_mode">form</field>
             <field name="target">new</field>
         </record>
-        
+
         <!-- register configuration wizard -->
         <record id="config_wizard_step_case_section_menu" model="ir.actions.todo">
-            <field name="name">Create Calendars for CRM Case Section</field>
-            <field name="note">This Configuration step use to create Calendars in document for all Case Sections</field>
             <field name="action_id" ref="action_view_document_ics_config_directories"/>
         </record>
-        
-        
-     </data>  
+     </data>
 </openerp>
-  
+