diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
index 56c18c82b7a..bfa0f2d11e6 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_analytic_profit_view.xml
@@ -7,23 +7,21 @@
             <field name="model">hr.timesheet.analytic.profit</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-				<form string="Timesheet Profit">
-					<group height="420" width="370">
-						<group col="4" colspan="4">
-							<field name="date_from"/>
-							<field name="date_to"/>
+                <form string="Timesheet Profit" version="7.0">
+                    <header>
+                        <button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print" class="oe_form_button_active_flow"/>
+                    </header>
+                    <group height="420" width="370">
+                        <group col="4" colspan="4">
+                            <field name="date_from"/>
+                            <field name="date_to"/>
                             <separator string="Journals" colspan="4"/>
-							<field name="journal_ids" colspan="4" nolabel="1"/>
+                            <field name="journal_ids" colspan="4" nolabel="1"/>
                             <separator string="Users" colspan="4"/>
-							<field name="employee_ids" colspan="4" nolabel="1"/>
-						</group>
-						<separator colspan="4"/>
-						<group col="2" colspan="4">
-							<button special="cancel" string="Cancel" icon="gtk-cancel"/>
-							<button name="print_report" string="Print" colspan="1" type="object" icon="gtk-print"/>
-						</group>
-					</group>
-				</form>
+                            <field name="employee_ids" colspan="4" nolabel="1"/>
+                        </group>
+                    </group>
+                </form>
             </field>
         </record>
 
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
index ab857567654..977334f0231 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_final_view.xml
@@ -26,7 +26,10 @@
             <field name="model">hr.timesheet.invoice.create.final</field>
             <field name="type">form</field>
             <field name="arch" type="xml">
-            <form string="Invoice contract">
+            <form string="Invoice contract" versio="7.0">
+                <header>
+                    <button name="do_create" string="Create Invoice" colspan="1" type="object" icon="terp-gtk-go-back-rtl" class="oe_form_button_active_flow"/>
+                </header>
                 <group col="4" colspan="6">
                     <separator string="Do you want to display work details on the invoice?" colspan="4"/>
                     <field name="date"/>
@@ -36,11 +39,6 @@
                     <separator string="Force to use a special product" colspan="4"/>
                     <field name="product"/>
                 </group>
-                <separator colspan="4"/>
-                <group col="2" colspan="4">
-                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
-                    <button name="do_create" string="Create Invoice" colspan="1" type="object" icon="terp-gtk-go-back-rtl"/>
-                </group>
             </form>
             </field>
         </record>
diff --git a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
index 663fc9b58de..c542c33216d 100644
--- a/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
+++ b/addons/hr_timesheet_invoice/wizard/hr_timesheet_invoice_create_view.xml
@@ -9,8 +9,7 @@
             <field name="arch" type="xml">
             <form string="Create Invoice" version="7.0">
                 <header>
-                    <button name="do_create" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl"/>
-                    <button special="cancel"  string="Cancel" icon='gtk-cancel'/>
+                    <button name="do_create" string="Create Invoices" type="object" icon="terp-gtk-go-back-rtl" class="oe_form_button_active_flow"/>
                 </header>
                 <notebook>
                     <page string="Billing Data">