diff --git a/account_credit_control/wizard/credit_control_emailer_view.xml b/account_credit_control/wizard/credit_control_emailer_view.xml
index ac0e5eb8c..3d8ea9574 100644
--- a/account_credit_control/wizard/credit_control_emailer_view.xml
+++ b/account_credit_control/wizard/credit_control_emailer_view.xml
@@ -6,15 +6,26 @@
       <field name="model">credit.control.emailer</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="Mailer">
+        <form string="Mailer" version="7.0">
           <separator string="Send emails for the selected lines" colspan="4"/>
           <newline/>
-          <field name="line_ids" colspan="4" nolabel="1" />
+          <notebook>
+            <page string="Lines">
+              <field name="line_ids" colspan="4" nolabel="1" />
+            </page>
+          </notebook>
           <newline/>
-          <group colspan="4">
-            <button special="cancel" string="Cancel" icon='gtk-cancel'/>
-            <button name="email_lines" string="Send the emails" type="object" icon="gtk-execute"/>
-          </group>
+          <footer>
+            <button class="oe_highlight"
+                    name="email_lines"
+                    string="Send the emails"
+                    type="object"/>
+            or
+            <button
+                class="oe_link"
+                special="cancel"
+                string="Cancel"/>
+          </footer>
         </form>
       </field>
     </record>
diff --git a/account_credit_control/wizard/credit_control_marker_view.xml b/account_credit_control/wizard/credit_control_marker_view.xml
index 567a26037..03af8dbb8 100644
--- a/account_credit_control/wizard/credit_control_marker_view.xml
+++ b/account_credit_control/wizard/credit_control_marker_view.xml
@@ -6,17 +6,33 @@
       <field name="model">credit.control.marker</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="Lines marker">
-          <separator string="Change the state of the selected lines." colspan="4"/>
+        <form string="Lines marker" version="7.0">
+          <separator string="Change the state of the selected lines" colspan="4"/>
+          <newline/>
           <label string="Warning: you will maybe not be able to revert this operation." colspan="4"></label>
           <newline/>
-          <field name="name" colspan="4"/>
-          <field name="line_ids" colspan="4" nolabel="1"/>
-          <newline/>
-          <group colspan="4">
-            <button special="cancel" string="Cancel" icon='gtk-cancel'/>
-            <button name="mark_lines" string="Change Lines' State" type="object" icon="gtk-execute"/>
+          <group>
+            <group><field name="name"/></group>
+            <group></group>
           </group>
+          <notebook>
+            <page string="Lines">
+              <field name="line_ids" colspan="4" nolabel="1"/>
+            </page>
+          </notebook>
+          <newline/>
+          <footer>
+            <button
+                class="oe_highlight"
+                name="mark_lines"
+                string="Change Lines' State"
+                type="object"/>
+            or
+            <button
+                class="oe_link"
+                special="cancel"
+                string="Cancel"/>
+          </footer>
         </form>
       </field>
     </record>
diff --git a/account_credit_control/wizard/credit_control_printer_view.xml b/account_credit_control/wizard/credit_control_printer_view.xml
index dd07c1b13..021bd242e 100644
--- a/account_credit_control/wizard/credit_control_printer_view.xml
+++ b/account_credit_control/wizard/credit_control_printer_view.xml
@@ -6,21 +6,25 @@
       <field name="model">credit.control.printer</field>
       <field name="type">form</field>
       <field name="arch" type="xml">
-        <form string="Lines report">
-          <separator colspan="4" string="Print the selected lines"/>
+        <form string="Lines report" version="7.0">
+          <separator string="Print the selected lines" colspan="4"/>
           <newline/>
           <field name="mark_as_sent" colspan="4" attrs="{'invisible': [('state', '=', 'done')]}"/>
           <newline/>
+          <notebook>
+            <page string="Lines" attrs="{'invisible': [('state', '=', 'done')]}">
           <field name="line_ids" colspan="4" nolabel="1"
             attrs="{'invisible': [('state', '=', 'done')]}" />
+            </page>
+          </notebook>
           <field name="report_file" colspan="4" attrs="{'invisible': [('state', '!=', 'done')]}"/>
           <field name="state" invisible="1" />
           <newline/>
-          <group colspan="4">
+          <footer>
+            <button class="oe_highlight" name="print_lines" string="Print" type="object"  attrs="{'invisible': [('state', '==', 'done')]}"/>
             <button special="cancel" string="Cancel" icon='gtk-cancel' attrs="{'invisible': [('state', '==', 'done')]}"/>
-            <button name="print_lines" string="Print" type="object" icon="gtk-execute" attrs="{'invisible': [('state', '==', 'done')]}"/>
             <button special="cancel" string="Close" icon='gtk-close' attrs="{'invisible': [('state', '!=', 'done')]}"/>
-          </group>
+          </footer>
         </form>
       </field>
     </record>