diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index 8fe6624525c..1306f75a717 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -146,11 +146,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
-                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
-                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
-                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
-                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
+                    <button name="invoice_open" states="draft,proforma2" string="Approve"/>
+                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid'/>
+                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
+                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                     </div>
@@ -262,13 +262,13 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" icon="terp-gtk-media-pause" groups="account.group_proforma_invoices"/>
-                    <button name="invoice_open" states="draft,proforma2" string="Validate" icon="gtk-go-forward"/>
-                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" icon="gtk-convert" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
-                    <button name="%(account_invoices)d" string="Print Invoice" type="action" icon="gtk-print" states="open,paid,proforma,sale,proforma2"/>
-                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid' icon="gtk-execute"/>
-                    <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
-                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel" groups="base.group_no_one"/>
+                    <button name="invoice_proforma2" states="draft" string="PRO-FORMA" groups="account.group_proforma_invoices"/>
+                    <button name="invoice_open" states="draft,proforma2" string="Validate"/>
+                    <button name='%(action_account_state_open)d' type='action' string='Re-Open' groups="account.group_account_invoice" attrs="{'invisible':['|', ('state','&lt;&gt;','paid'), ('reconciled', '=', True)]}" help="This button only appears when the state of the invoice is 'paid' (showing that it has been fully reconciled) and auto-computed boolean 'reconciled' is False (depicting that it's not the case anymore). In other words, the invoice has been dereconciled and it does not fit anymore the 'paid' state. You should press this button to re-open it and let it continue its normal process after having resolved the eventual exceptions it may have created."/>
+                    <button name="%(account_invoices)d" string="Print Invoice" type="action" states="open,paid,proforma,sale,proforma2"/>
+                    <button name="%(action_account_invoice_refund)d" type='action' string='Refund' states='open,paid'/>
+                    <button name="action_cancel_draft" states="cancel" string="Reset to Draft" type="object"/>
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" groups="base.group_no_one"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,paid" statusbar_colors='{"proforma":"blue","proforma2":"blue"}'/>
                     </div>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 4801d785e0a..b7bd4e55ce5 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -13,8 +13,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="create_period" states="draft" string="Create Monthly Periods" type="object" icon="terp-document-new"/>
-                    <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object" icon="terp-document-new"/>
+                    <button name="create_period" states="draft" string="Create Monthly Periods" type="object"/>
+                    <button name="create_period3" states="draft" string="Create 3 Months Periods" type="object"/>
                     <div class="oe_right">
                         <field name="state" select="1" widget="statusbar" nolabel="1" />
                     </div>
@@ -98,7 +98,7 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="action_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert" groups="account.group_account_manager"/>
+                    <button name="action_draft" states="done" string="Set to Draft" type="object" groups="account.group_account_manager"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1"/>
                     </div>
@@ -606,9 +606,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="button_confirm_bank" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
-                    <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
-                    <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
+                    <button name="button_confirm_bank" states="draft" string="Confirm" type="object" />
+                    <button name="button_dummy" states="draft" string="Compute" type="object"/>
+                    <button name="button_cancel" states="confirm" string="Cancel" type="object"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                     </div>
@@ -671,9 +671,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="button_confirm_bank" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
-                    <button name="button_dummy" states="draft" string="Compute" type="object" icon="terp-stock_format-scientific"/>
-                    <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
+                    <button name="button_confirm_bank" states="draft" string="Confirm" type="object" />
+                    <button name="button_dummy" states="draft" string="Compute" type="object"/>
+                    <button name="button_cancel" states="confirm" string="Cancel" type="object"/>
                     <div class="oe_right">
                         <field name="state"  widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                     </div>
@@ -1367,8 +1367,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="button_validate" states="draft" string="Post" type="object" icon="terp-camera_test"/>
-                    <button name="button_cancel" states="posted" string="Cancel" type="object" icon="gtk-cancel"/>
+                    <button name="button_validate" states="draft" string="Post" type="object"/>
+                    <button name="button_cancel" states="posted" string="Cancel" type="object"/>
                     <div class="oe_right">
                         <field name="state" select="1" widget="statusbar" nolabel="1" />
                     </div>
@@ -2641,9 +2641,9 @@ action = pool.get('res.config').next(cr, uid, [], context)
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="button_confirm_cash" states="open" string="Close CashBox" icon="terp-dialog-close" type="object"/>
-                    <button name="button_open" states="draft" string="Open CashBox" icon="gtk-go-forward" type="object"/>
-                    <button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object" groups="base.group_extended"/>
+                    <button name="button_confirm_cash" states="open" string="Close CashBox" type="object"/>
+                    <button name="button_open" states="draft" string="Open CashBox" type="object"/>
+                    <button name="button_cancel" states="confirm,open" string="Cancel" type="object" groups="base.group_extended"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                     </div>
diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 19df7653d86..1affcf7a85c 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -80,9 +80,9 @@
         <field name="arch" type="xml">
            <form layout="manual">
            <div class="oe_form_topbar">
-               <button name="validate" states="draft" string="Confirm Asset" type="object" icon="terp-camera_test"/>
-               <button name="set_to_close" states="open" string="Set to Close" type="object" icon="gtk-close"/>
-               <button name="set_to_draft" states="open" string="Set to Draft" type="object" icon="gtk-convert"/> 
+               <button name="validate" states="draft" string="Confirm Asset" type="object"/>
+               <button name="set_to_close" states="open" string="Set to Close" type="object"/>
+               <button name="set_to_draft" states="open" string="Set to Draft" type="object"/> 
                <div class="oe_right">
                    <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
                </div>
diff --git a/addons/account_budget/account_budget_view.xml b/addons/account_budget/account_budget_view.xml
index a4239054567..13c97ca32d6 100644
--- a/addons/account_budget/account_budget_view.xml
+++ b/addons/account_budget/account_budget_view.xml
@@ -106,11 +106,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-apply" />
-                    <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-ok"/>
-                    <button string="Done" name="done" states="validate" type="workflow"   icon="gtk-jump-to" />
-                    <button name="draft" states="cancel" string="Reset to Draft" type="workflow" icon="terp-stock_effects-object-colorize"/>
-                    <button string="Cancel" name="cancel" states="confirm,validate" type="workflow" icon="gtk-cancel"/>
+                    <button string="Confirm" name="confirm" states="draft" type="workflow" />
+                    <button string="Approve" name="validate" states="confirm" type="workflow"/>
+                    <button string="Done" name="done" states="validate" type="workflow"   />
+                    <button name="draft" states="cancel" string="Reset to Draft" type="workflow"/>
+                    <button string="Cancel" name="cancel" states="confirm,validate" type="workflow"/>
                     <div class="oe_right">
                         <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                     </div>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 33c94ba1412..285b5983b1a 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -102,10 +102,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="open" states="draft" string="Confirm Payments"  icon="gtk-apply"/>
-                    <button name="set_done" states="open" string="Make Payments" type="object" icon="gtk-execute"/>
-                    <button name="set_to_draft" states="cancel" string="Set to draft" type="object" icon="gtk-convert"/>
-                    <button name="cancel" states="draft,open" string="Cancel" icon="gtk-cancel"/>
+                    <button name="open" states="draft" string="Confirm Payments" />
+                    <button name="set_done" states="open" string="Make Payments" type="object"/>
+                    <button name="set_to_draft" states="cancel" string="Set to draft" type="object"/>
+                    <button name="cancel" states="draft,open" string="Cancel"/>
                     <div class="oe_right">
                         <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
                     </div>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index 58319743a99..9b5f9ad901c 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -42,10 +42,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                   <div class="oe_form_topbar">
-                      <button name="proforma_voucher" string="Post" states="draft" icon="terp-camera_test"/>
-                      <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile this record ?"/>
-                      <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
-                      <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                      <button name="proforma_voucher" string="Post" states="draft"/>
+                      <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to unreconcile this record ?"/>
+                      <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
+                      <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
                       <div class="oe_right">
                           <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                       </div>
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 56a156ac68e..864ed8df941 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -145,10 +145,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
-                    <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
-                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
-                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
+                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
+                    <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
+                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                     </div>
@@ -299,10 +299,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward" invisible="context.get('line_type', False)"/>
-                    <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel" invisible="context.get('line_type', False)"/>
-                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" icon="terp-stock_effects-object-colorize" confirm="Are you sure to unreconcile and cancel this record ?"/>
-                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize" invisible="context.get('line_type', False)"/>
+                    <button name="proforma_voucher" string="Validate" states="draft" invisible="context.get('line_type', False)"/>
+                    <button name="cancel_voucher" string="Cancel" states="draft,proforma"  invisible="context.get('line_type', False)"/>
+                    <button name="cancel_voucher" string="Unreconcile" type="object" states="posted" invisible="context.get('line_type', False)" confirm="Are you sure to unreconcile and cancel this record ?"/>
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" invisible="context.get('line_type', False)"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                     </div>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 24a20b34dcb..d3bb60230c6 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -82,11 +82,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
-                    <button icon="terp-dolar_ok!" name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
-                    <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
-                    <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
-                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                    <button name="proforma_voucher" string="Validate" states="draft"/>
+                    <button name="%(act_pay_voucher)d" context="{'narration':narration, 'title':'Customer Payment', 'type':'receipt', 'partner_id':partner_id, 'reference':reference, 'amount':amount}" type="action" string="Pay" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
+                    <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
+                    <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                     </div>
@@ -211,11 +211,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="proforma_voucher" string="Validate" states="draft" icon="gtk-go-forward"/>
-                    <button icon="terp-dolar_ok!" name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
-                    <button name="cancel_voucher" string="Cancel" states="draft,proforma"  icon="gtk-cancel"/>
-                    <button name="cancel_voucher" string="Cancel" type="object" states="posted" icon="terp-stock_effects-object-colorize" confirm="Are you sure to confirm this record ?"/>
-                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft" icon="terp-stock_effects-object-colorize"/>
+                    <button name="proforma_voucher" string="Validate" states="draft"/>
+                    <button name="%(act_pay_bills)d" context="{'narration':narration, 'title':'Bill Payment', 'type':'payment', 'partner_id': partner_id, 'reference':reference}" type="action" string="Pay Bill" attrs="{'invisible':['|',('pay_now','=','pay_now'),'|',('state','=','draft'), ('paid','=',True)]}"/>
+                    <button name="cancel_voucher" string="Cancel" states="draft,proforma" />
+                    <button name="cancel_voucher" string="Cancel" type="object" states="posted" confirm="Are you sure to confirm this record ?"/>
+                    <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                     </div>
diff --git a/addons/base_calendar/base_calendar_view.xml b/addons/base_calendar/base_calendar_view.xml
index 055b2237a34..76304c7da8a 100644
--- a/addons/base_calendar/base_calendar_view.xml
+++ b/addons/base_calendar/base_calendar_view.xml
@@ -13,19 +13,19 @@
                         <button name="do_tentative"
                             states="needs-action,declined,accepted"
                             string="Uncertain" type="object"
-                            icon="terp-crm" />
+                            />
                         <button name="do_accept" string="Accept"
                             states="needs-action,tentative,declined"
-                            type="object" icon="gtk-apply" />
+                            type="object" />
                         <button
                             name="%(base_calendar.action_view_calendar_invite_attendee_wizard)d"
                             string="Delegate" type="action"
-                            icon="gtk-sort-descending"
+                           
                             states="needs-action,tentative,declined,accepted"
                             context="{'model' : 'calendar.attendee', 'attendee_field' : 'child_ids'}" />
                         <button name="do_decline" string="Decline"
                             states="needs-action,tentative,accepted"
-                            type="object" icon="gtk-cancel" />
+                            type="object" />
                         <div class="oe_right">
                             <field name="state" widget="statusbar" nolabel="1" statusbar_visible="tentative,needs-action,accepted" statusbar_colors='{"proforma":"blue"}'/>
                         </div>
@@ -234,17 +234,17 @@
                         string="Confirm"
                         states="tentative,cancelled"
                         type="object"
-                        icon="gtk-apply" />
+                        />
                     <button name="do_tentative"
                         states="confirmed,cancelled"
                         string="Uncertain"
                         type="object"
-                        icon="terp-crm" />
+                        />
                     <button name="do_cancel"
                         string="Cancel"
                         states="tentative,confirmed"
                         type="object"
-                        icon="gtk-cancel" />
+                        />
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="tentative,confirmed" statusbar_colors='{"proforma":"blue"}'/>
                     </div>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 17fd154e8a3..e609c8808ef 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -53,12 +53,12 @@
         <field name="arch" type="xml">
             <form string="Leads Form" layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
-                    <button name="case_mark_lost" string="Close" states="open,pending" type="object" icon="gtk-close" />
-                    <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause" />
-                    <button name="case_escalate" string="Escalate" states="open,pending" type="object" icon="gtk-go-up" />
-                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
-                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel" />
+                    <button name="case_open" string="Open" states="draft,pending" type="object" />
+                    <button name="case_mark_lost" string="Close" states="open,pending" type="object" />
+                    <button name="case_pending" string="Pending" states="open" type="object" />
+                    <button name="case_escalate" string="Escalate" states="open,pending" type="object" />
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" />
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
@@ -402,13 +402,13 @@
         <field name="arch" type="xml">
             <form string="Opportunities" layout="manual">
                 <div class="oe_form_topbar oe_form_topbar_hifirst">
-                    <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" icon="gtk-apply" />
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
-                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
-                    <button name="case_escalate" string="Escalate" states="open,pending" type="object" icon="gtk-go-up" />
-                    <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" icon="gtk-cancel" />
-                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
-                    <button name="case_cancel" string="Cancel" states="draft" type="object" icon="gtk-cancel" />
+                    <button name="case_mark_won" string="Mark Won" states="open,pending" type="object" />
+                    <button name="case_open" string="Open" states="draft,pending" type="object" />
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" />
+                    <button name="case_escalate" string="Escalate" states="open,pending" type="object" />
+                    <button name="case_mark_lost" string="Mark Lost" states="open,pending" type="object" />
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
+                    <button name="case_cancel" string="Cancel" states="draft" type="object" />
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index fb41c0b22c3..55d8d8c9a64 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -60,11 +60,11 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button name="case_close" string="Held" states="open,pending" type="object" icon="gtk-jump-to" />
-                <button name="case_open" string="Todo" states="pending" type="object" icon="gtk-go-forward" />
-                <button name="case_pending" string="Not Held" states="open" type="object" icon="gtk-media-pause" />
-                <button name="case_reset" string="Reset to Todo" states="cancel" type="object" icon="gtk-convert" />
-                <button name="case_cancel" string="Cancel" states="open,pending" type="object" icon="gtk-cancel" />
+                <button name="case_close" string="Held" states="open,pending" type="object" />
+                <button name="case_open" string="Todo" states="pending" type="object" />
+                <button name="case_pending" string="Not Held" states="open" type="object" />
+                <button name="case_reset" string="Reset to Todo" states="cancel" type="object" />
+                <button name="case_cancel" string="Cancel" states="open,pending" type="object" />
                 <div class="oe_right">
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="open,done" statusbar_colors='{"pending":"red"}' select="1"/>
                 </div>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 6e26416f2ff..2ed988df02a 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -68,11 +68,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_close" string="Done" states="open,pending" type="object" icon="gtk-jump-to" />
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
-                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
-                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
-                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel" />
+                    <button name="case_close" string="Done" states="open,pending" type="object" />
+                    <button name="case_open" string="Open" states="draft,pending" type="object" />
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" />
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" />
                     <div class="oe_right">
                         <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index d622355aa73..f46b24171de 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -79,12 +79,12 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_close" string="Done" states="open,pending" type="object" icon="gtk-close" />
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward" />
-                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause" />
-                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" groups="base.group_extended" icon="gtk-go-up" />
-                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" icon="gtk-convert" />
-                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel" />
+                    <button name="case_close" string="Done" states="open,pending" type="object" />
+                    <button name="case_open" string="Open" states="draft,pending" type="object" />
+                    <button name="case_pending" string="Pending" states="draft,open" type="object" />
+                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" groups="base.group_extended" />
+                    <button name="case_reset" string="Reset to Draft" states="done,cancel" type="object" />
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" />
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index b5b6f0dd0d0..d36ea8db8c5 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -30,12 +30,12 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_close" states="open,pending" string="Close" type="object" icon="gtk-jump-to" />
-                    <button name="case_open" states="draft,pending" string="Open" type="object" icon="gtk-go-forward" />
-                    <button name="case_pending" states="draft,open" string="Pending" type="object" icon="gtk-media-pause" />
-                    <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
-                    <button name="case_escalate" states="open,draft,pending" string="Escalate" type="object" icon="gtk-go-up" />
-                    <button name="case_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel" />
+                    <button name="case_close" states="open,pending" string="Close" type="object" />
+                    <button name="case_open" states="draft,pending" string="Open" type="object" />
+                    <button name="case_pending" states="draft,open" string="Pending" type="object" />
+                    <button name="case_reset" states="done,cancel" string="Reset to Draft" type="object" />
+                    <button name="case_escalate" states="open,draft,pending" string="Escalate" type="object" />
+                    <button name="case_cancel" states="draft,open,pending" string="Cancel" type="object" />
                     <div class="oe_right">
                         <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index ea286aafaec..ecad0182982 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -52,10 +52,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button string="Confirm Event" name="button_confirm" states="draft" type="object" icon="gtk-apply"/>
-                    <button string="Event Done" name="button_done" states="confirm" type="object" icon="gtk-jump-to"/>
-                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object" icon="gtk-cancel"/>
+                    <button string="Confirm Event" name="button_confirm" states="draft" type="object"/>
+                    <button string="Mark Done" name="button_done" states="confirm" type="object"/>
+                    <button string="Set To Draft" name="button_draft" states="cancel,done" type="object"/>
+                    <button string="Cancel Event" name="button_cancel" states="draft,confirm" type="object"/>
                     <div class="oe_right">
                         <field name="state" select="1" nolabel="1" widget="statusbar" statusbar_visible="draft,confirm,done"/>
                     </div>
@@ -360,10 +360,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="registration_open" string="Confirm Registration" states="draft" type="object" icon="gtk-apply"/>
-                    <button name="button_reg_close" string="Attended" states="open" type="object" icon="gtk-apply"/>
-                    <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object" icon="gtk-convert"/>
-                    <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object" icon="gtk-cancel"/>
+                    <button name="registration_open" string="Confirm" states="draft" type="object"/>
+                    <button name="button_reg_close" string="Attended" states="open" type="object"/>
+                    <button string="Set To Unconfirmed" name="do_draft" states="cancel,done" type="object"/>
+                    <button name="button_reg_cancel" string="Cancel Registration" states="draft,open" type="object"/>
                     <div class="oe_right">
                         <field name="state" select="1" nolabel="1" colspan="2" widget="statusbar" statusbar_visible="draft,open,done"/>
                     </div>
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 14745f72419..1e07a4c81c6 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -347,9 +347,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="job_recruitement" string="In Recruitement" states="open" type="object" icon="gtk-go-forward"/>
-                    <button name="job_open" string="In Position" states="old,recruit" type="object" icon="terp-camera_test"/>
-                    <button name="job_old" string="Mark as Old" states="open,recruit" type="object" icon="gtk-cancel"/>
+                    <button name="job_recruitement" string="In Recruitement" states="open" type="object"/>
+                    <button name="job_open" string="In Position" states="old,recruit" type="object"/>
+                    <button name="job_old" string="Mark as Old" states="open,recruit" type="object"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="recruit,open"/>
                     </div>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 2e8c23082fd..d87b44aa2be 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -156,11 +156,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="button_plan_in_progress" string="Start Appraisal" states="draft" type="object" icon="gtk-execute"/>
-                    <button name="button_final_validation" string="Validate Appraisal" states="wait" type="object" icon="gtk-go-forward"/>
-                    <button name="button_done" string="Done" states="progress" type="object" icon="gtk-jump-to"/>
-                    <button name="button_draft" string="Reset to Draft" states="cancel" type="object" icon="terp-stock_effects-object-colorize"/>
-                    <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object" icon="gtk-cancel"/>
+                    <button name="button_plan_in_progress" string="Start Appraisal" states="draft" type="object"/>
+                    <button name="button_final_validation" string="Validate Appraisal" states="wait" type="object"/>
+                    <button name="button_done" string="Done" states="progress" type="object"/>
+                    <button name="button_draft" string="Reset to Draft" states="cancel" type="object"/>
+                    <button name="button_cancel" string="Cancel" states="draft,wait,progress" type="object"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,wait,done" statusbar_colors='{"progress":"blue"}'/>
                     </div>
diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index cdfa5485158..d82f89930ef 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -67,11 +67,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="confirm" states="draft" string="Submit to Manager" type="workflow" icon="gtk-apply"/>
-                    <button name="validate" states="confirm" string="Approve" type="workflow" icon="gtk-go-forward" groups="base.group_hr_user"/>
-                    <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" icon="gtk-convert" groups="base.group_hr_user"/>
-                    <button name="invoice" states="accepted" string="Invoice" type="object" icon="gtk-go-forward" groups="base.group_hr_user"/>
-                    <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" icon="gtk-no" groups="base.group_hr_user" />
+                    <button name="confirm" states="draft" string="Submit to Manager" type="workflow"/>
+                    <button name="validate" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user"/>
+                    <button name="draft" states="confirm,cancelled" string="Set to Draft" type="workflow" groups="base.group_hr_user"/>
+                    <button name="invoice" states="accepted" string="Invoice" type="object" groups="base.group_hr_user"/>
+                    <button name="refuse" states="confirm,accepted" string="Refuse" type="workflow" groups="base.group_hr_user" />
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,accepted" statusbar_colors='{"confirm":"blue","cancelled":"red"}'/>
                     </div>
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 9cfd2706cef..57756c5cb35 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -65,11 +65,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
-                    <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                    <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user,base.group_hr_manager"/>
-                    <button string="Set to Draft" name="set_to_draft" states="refuse,validate" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
+                    <button string="Confirm" name="confirm" states="draft" type="workflow"/>
+                    <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user"/>
+                    <button string="Approved" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user"/>
+                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user,base.group_hr_manager"/>
+                    <button string="Set to Draft" name="set_to_draft" states="refuse,validate" type="object" groups="base.group_hr_user"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                     </div>
@@ -117,11 +117,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button string="Confirm" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
-                    <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                    <button string="Approved" name="second_validate" states="validate1" type="workflow" icon="gtk-apply" groups="base.group_hr_user"/>
-                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" icon="gtk-no" groups="base.group_hr_user"/>
-                    <button string="Set to Draft" name="set_to_draft" states="cancel,validate,refuse" type="object" icon="gtk-convert" groups="base.group_hr_user"/>
+                    <button string="Confirm" name="confirm" states="draft" type="workflow"/>
+                    <button string="Approve" name="validate" states="confirm" type="workflow" groups="base.group_hr_user"/>
+                    <button string="Approved" name="second_validate" states="validate1" type="workflow" groups="base.group_hr_user"/>
+                    <button string="Refuse" name="refuse" states="confirm,validate1" type="workflow" groups="base.group_hr_user"/>
+                    <button string="Set to Draft" name="set_to_draft" states="cancel,validate,refuse" type="object" groups="base.group_hr_user"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm,validate" statusbar_colors='{"confirm":"blue","validate1":"blue","refuse":"red"}'/>
                     </div>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 0e59dd393ca..93e875b61be 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -262,11 +262,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button string="Confirm" icon="terp-camera_test" name="hr_verify_sheet" states="draft"/>
-                    <button string="Refund" icon="gtk-execute" name="refund_sheet" states="confirm,done" type='object'/>
-                    <button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="draft" states="cancel"/>
-                    <button string="Compute Sheet" icon="terp-stock_format-scientific" name="compute_sheet" type="object" states="draft"/>
-                    <button string="Cancel" icon="terp-dialog-close" name="cancel_sheet" states="draft,hr_check,confirm,verify"/>
+                    <button string="Confirm" name="hr_verify_sheet" states="draft"/>
+                    <button string="Refund" name="refund_sheet" states="confirm,done" type='object'/>
+                    <button string="Set to Draft" name="draft" states="cancel"/>
+                    <button string="Compute Sheet" name="compute_sheet" type="object" states="draft"/>
+                    <button string="Cancel" name="cancel_sheet" states="draft,hr_check,confirm,verify"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                     </div>
@@ -726,9 +726,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="close_payslip_run" type="object" icon="terp-camera_test" string="Close" states="draft"/>
-                    <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" icon="gtk-execute" string="Generate Payslips" />
-                    <button string="Set to Draft" icon="terp-stock_effects-object-colorize" name="draft_payslip_run" type="object" states="close"/>
+                    <button name="close_payslip_run" type="object" string="Close" states="draft"/>
+                    <button name="%(action_hr_payslip_by_employees)d" type="action" states="draft" string="Generate Payslips" />
+                    <button string="Set to Draft" name="draft_payslip_run" type="object" states="close"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1"/>
                     </div>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index b11bc9af3cd..ab58a167f06 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -76,11 +76,11 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action" icon="terp-partner"/>
-                <button name="case_open" string="In Progress" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                <button name="case_pending" string="Pending" states="open" type="object" icon="gtk-media-pause"/>
-                <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
-                <button name="case_cancel" string="Refuse" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                <button name="%(action_hr_recruitment_hired_employee)d" string="Hire" states="open,pending" type="action"/>
+                <button name="case_open" string="In Progress" states="draft,pending" type="object"/>
+                <button name="case_pending" string="Pending" states="open" type="object"/>
+                <button name="case_reset" string="Reset to New" states="done,cancel" type="object"/>
+                <button name="case_cancel" string="Refuse" states="draft,open,pending" type="object"/>
                 <div class="oe_right">
                     <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                 </div>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
index 1444f8191f3..43ca7a4004e 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_view.xml
@@ -24,10 +24,10 @@
                 </group>
                 <xpath expr="/form/sheet" position='before'>
                     <div class="oe_form_topbar">
-                        <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
-                        <button name="set_close" string="Close" type="object" states="open,pending" icon="terp-dialog-close"/>
-                        <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft" icon="gtk-ok"/>
-                        <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
+                        <button name="set_pending" string="Pending" type="object" states="open"/>
+                        <button name="set_close" string="Close" type="object" states="open,pending"/>
+                        <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close,draft"/>
+                        <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                         <div class="oe_right">
                             <field name="state" readonly="1" widget="statusbar" nolabel="1"
                             statusbar_visible="open,pending,close" statusbar_colors='{"pending":"red", "template":"blue"}'/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index bcd13aaa296..aa815df5337 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -62,10 +62,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="button_confirm" states="draft" string="Submited to Manager" type="object" icon="terp-check"/>
-                    <button name="done" states="confirm" string="Approve" type="workflow" icon="terp-camera_test" groups="base.group_hr_user"/>
-                    <button name="action_set_to_draft" states="done" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
-                    <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel" groups="base.group_hr_user"/>
+                    <button name="button_confirm" states="draft" string="Submited to Manager" type="object"/>
+                    <button name="done" states="confirm" string="Approve" type="workflow" groups="base.group_hr_user"/>
+                    <button name="action_set_to_draft" states="done" string="Set to Draft" type="object"/>
+                    <button name="cancel" states="confirm" string="Refuse" type="workflow" groups="base.group_hr_user"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="new,confirm,done"/>
                     </div>
diff --git a/addons/idea/idea_view.xml b/addons/idea/idea_view.xml
index a1adbd19f4a..a3a1f2937ec 100644
--- a/addons/idea/idea_view.xml
+++ b/addons/idea/idea_view.xml
@@ -184,9 +184,9 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button name="idea_open" string="Open" states="draft" icon="gtk-go-forward"/>
-                <button name="idea_close" string="Accept" states="open" icon="gtk-jump-to"/>
-                <button name="idea_cancel" string="Refuse" states="open"  icon="gtk-cancel"/>
+                <button name="idea_open" string="Open" states="draft"/>
+                <button name="idea_close" string="Accept" states="open"/>
+                <button name="idea_cancel" string="Refuse" states="open" />
                 <div class="oe_right">
                     <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,open,close"/>
                 </div>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 8201d93da5a..adfccfc2041 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -25,8 +25,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" icon="gtk-ok" attrs="{'invisible':[('state','=','confirmed')]}"/>
-                    <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action" icon="gtk-cancel"/>
+                    <button name="%(action_lunch_order_confirm)d" string="Confirm Order" type="action" attrs="{'invisible':[('state','=','confirmed')]}"/>
+                    <button name="%(action_lunch_order_cancel)d" string="Cancel Order" type="action"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirmed"/>
                     </div>
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index b6146ebcd66..fbc36701cd0 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -17,10 +17,10 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button name="state_running_set" string="Run" states="draft" icon="gtk-apply"/>
-                <button name="state_done_set" string="Done" states="running" icon="terp-dialog-close"/>
-                <button name="state_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
-                <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
+                <button name="state_running_set" string="Run" states="draft"/>
+                <button name="state_done_set" string="Done" states="running"/>
+                <button name="state_draft_set" string="Set to Draft" states="done,cancelled"/>
+                <button name="state_cancel_set" string="Cancel" states="running"/>
                 <div class="oe_right">
                     <field name="state" readonly="1" widget="statusbar" nolabel="1" statusbar_visible="draft,running,done"/>
                 </div>
@@ -141,10 +141,10 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button name="state_running_set" string="Run" states="draft" icon="gtk-apply"/>
-                <button name="state_done_set" string="Close" states="running" icon="terp-dialog-close"/>
-                <button name="state_draft_set" string="Set to Draft" states="done,cancelled" icon="gtk-convert"/>
-                <button name="state_cancel_set" string="Cancel" states="running" icon="terp-gtk-stop"/>
+                <button name="state_running_set" string="Run" states="draft"/>
+                <button name="state_done_set" string="Close" states="running"/>
+                <button name="state_draft_set" string="Set to Draft" states="done,cancelled"/>
+                <button name="state_cancel_set" string="Cancel" states="running"/>
                 <div class="oe_right">
                     <field name="state" readonly="1" nolabel="1" widget="statusbar" statusbar_visible="draft,running,done"/>
                 </div>
@@ -366,9 +366,9 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button string="Process" states="todo" name="process" type="object" icon="terp-gtk-go-back-rtl"/>
-                <button string="Reset" states="exception,cancelled" name="button_draft" type="object" icon="gtk-undo"/>
-                <button string="Cancel" states="todo,exception" name="button_cancel" type="object" icon="terp-gtk-stop"/>
+                <button string="Process" states="todo" name="process" type="object"/>
+                <button string="Reset" states="exception,cancelled" name="button_draft" type="object"/>
+                <button string="Cancel" states="todo,exception" name="button_cancel" type="object"/>
                 <div class="oe_right">
                     <field name="state" readonly="True" nolabel="1" widget="statusbar" statusbar_visible="todo,done" statusbar_colors='{"exception":"red"}'/>
                 </div>
diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index 18915dac2e9..ebfd5b31bdd 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -633,13 +633,13 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="button_confirm" states="draft" string="Confirm Production" icon="gtk-apply"/>
-                    <button name="button_produce" states="ready" string="Start Production" icon="terp-gtk-jump-to-ltr"/>
-                    <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" icon="gtk-ok" type="action"/>
-                    <button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object" icon="gtk-jump-to"/>
-                    <button name="button_recreate" states="picking_except" string="Recreate Picking" icon="terp-document-new"/>
-                    <button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
-                    <button name="action_cancel" type="object" states="confirmed" string="Cancel" icon="gtk-stop"/>
+                    <button name="button_confirm" states="draft" string="Confirm Production"/>
+                    <button name="button_produce" states="ready" string="Start Production"/>
+                    <button name="%(act_mrp_product_produce)d" states="in_production" string="Produce" type="action"/>
+                    <button name="force_production" states="confirmed,picking_except" string="Force Reservation" type="object"/>
+                    <button name="button_recreate" states="picking_except" string="Recreate Picking"/>
+                    <button name="button_cancel" states="draft,ready,in_production,picking_except" string="Cancel"/>
+                    <button name="action_cancel" type="object" states="confirmed" string="Cancel"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,ready,in_production,done" statusbar_colors='{"picking_except":"red","confirmed":"blue"}'/>
                     </div>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index c206ee7f165..aedac905be5 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -73,12 +73,12 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button name="button_start_working" string="Start" states="draft" icon="terp-gtk-jump-to-ltr"/>
-                <button name="button_resume" string="Resume" states="pause" icon="gtk-media-pause"/>
-                <button name="button_done" string="Finished" states="startworking" icon="terp-check"/>
-                <button name="button_pause" string="Pending" states="startworking" icon="gtk-media-pause"/>
-                <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
-                <button name="button_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop"/>
+                <button name="button_start_working" string="Start" states="draft"/>
+                <button name="button_resume" string="Resume" states="pause"/>
+                <button name="button_done" string="Finished" states="startworking"/>
+                <button name="button_pause" string="Pending" states="startworking"/>
+                <button name="button_draft" string="Set Draft" states="cancel"/>
+                <button name="button_cancel" string="Cancel" states="draft,startworking"/>
                 <div class="oe_right">
                      <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,startworking"/>
                 </div>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 01f9d3d84b6..c089b4d9fa2 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -29,17 +29,17 @@
         <field name="arch" type="xml">
             <form layout="manual">
                <div class="oe_form_topbar">
-                   <button name="repair_confirm" states="draft" string="Confirm Repair" icon="terp-camera_test"/>
-                   <button name="repair_ready" states="confirmed" string="Start Repair" icon="terp-gtk-jump-to-ltr"/>
-                   <button name="action_repair_start" states="ready" string="Start Repair" icon="terp-gtk-jump-to-ltr"/>
-                   <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                   <button name="action_repair_end" states="under_repair" string="End Repair" icon="terp-dialog-close"/>
-                   <button name="action_invoice_create" states="2binvoiced" string="Make Invoice" icon="terp-dolar"/>
-                   <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="terp-dolar"/>
-                   <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected" icon="terp-emblem-important"/>
-                   <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action" icon="gtk-stop"/>
-                   <button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action" icon="gtk-stop"/>
-                   <button name="cancel" states="draft" string="Cancel Repair" icon="gtk-stop"/>
+                   <button name="repair_confirm" states="draft" string="Confirm Repair"/>
+                   <button name="repair_ready" states="confirmed" string="Start Repair"/>
+                   <button name="action_repair_start" states="ready" string="Start Repair"/>
+                   <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
+                   <button name="action_repair_end" states="under_repair" string="End Repair"/>
+                   <button name="action_invoice_create" states="2binvoiced" string="Make Invoice"/>
+                   <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
+                   <button name="invoice_corrected" states="invoice_except" string="Invoice Corrected"/>
+                   <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action"/>
+                   <button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action"/>
+                   <button name="cancel" states="draft" string="Cancel Repair"/>
                    <div class="oe_right">
                          <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirmed,ready" />
                    </div>
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index 5d81bbb708d..785c8d7d664 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -18,9 +18,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="%(action_pos_payment)d" string="Payment" icon="gtk-apply" type="action" states="draft"/>
-                    <button name="%(action_report_pos_receipt)d" string="Reprint" icon="gtk-print" type="action" states="paid,done,invoiced"/>
-                    <button name="refund" string="Return Products" type="object" icon="gtk-ok"
+                    <button name="%(action_pos_payment)d" string="Payment" type="action" states="draft"/>
+                    <button name="%(action_report_pos_receipt)d" string="Reprint" type="action" states="paid,done,invoiced"/>
+                    <button name="refund" string="Return Products" type="object"
                         attrs="{'invisible':[('state','=','draft')]}"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,paid,done" statusbar_colors='{"cancel":"red"}'/>
diff --git a/addons/procurement/procurement_view.xml b/addons/procurement/procurement_view.xml
index f543235633b..141d1509944 100644
--- a/addons/procurement/procurement_view.xml
+++ b/addons/procurement/procurement_view.xml
@@ -48,10 +48,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                     <div class="oe_form_topbar">
-                        <button name="button_confirm" states="draft" string="Confirm" icon="gtk-apply"/>
-                        <button name="button_check" states="confirmed" string="Run Procurement" icon="gtk-media-play"/>
-                        <button name="button_restart" states="exception" string="Retry" icon="gtk-convert"/>
-                        <button name="button_cancel" states="draft,exception,waiting" string="Cancel" icon="gtk-cancel"/>
+                        <button name="button_confirm" states="draft" string="Confirm"/>
+                        <button name="button_check" states="confirmed" string="Run Procurement"/>
+                        <button name="button_restart" states="exception" string="Retry"/>
+                        <button name="button_cancel" states="draft,exception,waiting" string="Cancel"/>
                         <div class="oe_right">
                             <field name="state" readonly="1" widget="statusbar" nolabel="1" statusbar_visible="draft,confirmed" />
                         </div>
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml
index aee5982f49e..278bd50f45a 100644
--- a/addons/project/project_view.xml
+++ b/addons/project/project_view.xml
@@ -20,13 +20,13 @@
             <field name="arch" type="xml">
                 <form string="Project" layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="set_done" string="Done" type="object" states="open,pending" icon="terp-dialog-close"/>
-                    <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close" icon="gtk-ok"/>
-                    <button name="set_pending" string="Pending" type="object" states="open" icon="gtk-media-pause"/>
-                    <button name="set_template" string="Set as Template" type="object" states="open" icon="gtk-convert"/>
-                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" icon="gtk-new" context="{'parent_id':parent_id}"/>
-                    <button name="reset_project" string="Reset as Project" type="object" states="template" icon="gtk-convert"/>
-                    <button name="set_cancel" string="Cancel" type="object" states="open,pending" icon="gtk-cancel"/>
+                    <button name="set_done" string="Done" type="object" states="open,pending"/>
+                    <button name="set_open" string="Re-open project" type="object" states="pending,cancelled,close"/>
+                    <button name="set_pending" string="Pending" type="object" states="open"/>
+                    <button name="set_template" string="Set as Template" type="object" states="open"/>
+                    <button string="New Project Based on Template" name="duplicate_template"  type="object" states="template" context="{'parent_id':parent_id}"/>
+                    <button name="reset_project" string="Reset as Project" type="object" states="template"/>
+                    <button name="set_cancel" string="Cancel" type="object" states="open,pending"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="open,close" statusbar_colors='{"pending":"blue"}' select="1" readonly="1"/>
                     </div>
@@ -321,13 +321,13 @@
             <field name="arch" type="xml">
                 <form string="Project" layout="manual">
                     <div class="oe_form_topbar">
-                        <button name="action_close" states="pending,open" string="Done" type="object" icon="terp-dialog-close"/>
-                        <button name="do_open" states="pending,draft" string="Start Task" type="object" icon="gtk-media-play"/>
-                        <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" icon="gtk-convert" context="{'button_reactivate':True}" />
-                        <button name="do_pending" states="open" string="Pending" type="object" icon="gtk-media-pause"/>
-                        <button name="do_draft" states="open" string="Draft" type="object" icon="gtk-indent"/>
-                        <button name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action" icon="terp-personal"/>
-                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object" icon="gtk-cancel"/>
+                        <button name="action_close" states="pending,open" string="Done" type="object"/>
+                        <button name="do_open" states="pending,draft" string="Start Task" type="object"/>
+                        <button name="%(action_project_task_reevaluate)d" states="done,cancelled" string="Reactivate" type="action" context="{'button_reactivate':True}" />
+                        <button name="do_pending" states="open" string="Pending" type="object"/>
+                        <button name="do_draft" states="open" string="Draft" type="object"/>
+                        <button name="%(action_project_task_delegate)d" states="pending,open,draft" string="Delegate" type="action"/>
+                        <button name="do_cancel" states="draft,open,pending" string="Cancel" type="object"/>
                         <div class="oe_right">
                             <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
                         </div>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index c4cb9cf73d4..cf8c4040613 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -52,12 +52,12 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="case_open" string="Open" states="draft,pending" type="object" icon="gtk-go-forward"/>
-                    <button name="case_close" string="Done" states="open,draft,pending" type="object" icon="terp-dialog-close"/>
-                    <button name="case_pending" string="Pending" states="draft,open" type="object" icon="gtk-media-pause"/>
-                    <button name="case_reset" string="Reset to New" states="done,cancel" type="object" icon="gtk-convert"/>
-                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object" icon="gtk-go-up"/>
-                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object" icon="gtk-cancel"/>
+                    <button name="case_open" string="Open" states="draft,pending" type="object"/>
+                    <button name="case_close" string="Done" states="open,draft,pending" type="object"/>
+                    <button name="case_pending" string="Pending" states="draft,open" type="object"/>
+                    <button name="case_reset" string="Reset to New" states="done,cancel" type="object"/>
+                    <button name="case_escalate" string="Escalate" states="open,draft,pending" type="object"/>
+                    <button name="case_cancel" string="Cancel" states="draft,open,pending" type="object"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}'/>
                     </div>
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 9cbbfaf75f3..02412a20a1f 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -143,11 +143,11 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button string="Start Phase" name="set_open" states="pending,draft" icon="gtk-execute"/>
-                    <button string="Done" name="set_done" states="pending,open" icon="terp-dialog-close"/>
-                    <button string="Pending" name="set_pending" states="open" icon="gtk-media-pause"/>
-                    <button string="Draft" name="set_draft" states="open" icon="gtk-indent"/>
-                    <button string="Cancel" name="set_cancel" states="draft,open,pending" icon="gtk-cancel"/>
+                    <button string="Start Phase" name="set_open" states="pending,draft"/>
+                    <button string="Done" name="set_done" states="pending,open"/>
+                    <button string="Pending" name="set_pending" states="open"/>
+                    <button string="Draft" name="set_draft" states="open"/>
+                    <button string="Cancel" name="set_cancel" states="draft,open,pending"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,open,done" statusbar_colors='{"pending":"blue"}' select="1"/>
                     </div>
diff --git a/addons/project_planning/project_planning_view.xml b/addons/project_planning/project_planning_view.xml
index 419bdc2b0ad..11e9b057c06 100644
--- a/addons/project_planning/project_planning_view.xml
+++ b/addons/project_planning/project_planning_view.xml
@@ -28,10 +28,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="action_open" states="draft" string="Open" type="object" icon="gtk-yes" />
-                    <button name="action_done" states="open" string="Done" type="object" icon="gtk-jump-to" />
-                    <button name="action_draft" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
-                    <button name="action_cancel" states="draft,open" string="Cancel" type="object" icon="gtk-cancel" />
+                    <button name="action_open" states="draft" string="Open" type="object" />
+                    <button name="action_done" states="open" string="Done" type="object" />
+                    <button name="action_draft" states="done,cancel" string="Reset to Draft" type="object" />
+                    <button name="action_cancel" states="draft,open" string="Cancel" type="object" />
                     <div class="oe_right">
                        <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
                     </div>
diff --git a/addons/project_scrum/project_scrum_view.xml b/addons/project_scrum/project_scrum_view.xml
index 54d71533ef8..4b8defc9a2b 100644
--- a/addons/project_scrum/project_scrum_view.xml
+++ b/addons/project_scrum/project_scrum_view.xml
@@ -58,12 +58,12 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
-                    <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
-                    <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
-                    <button type="action" string="Convert to Task" name="%(action_scrum_backlog_to_task)d" states="pending" icon="gtk-execute"/>
-                    <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
-                    <button type="object" string="Cancel" name="button_cancel" states="draft,open,pending" icon="gtk-stop"/>
+                    <button type="object" string="Open" name="button_open" states="draft,pending"/>
+                    <button type="object" string="Close" name="button_close" states="open,pending"/>
+                    <button type="object" string="Pending" name="button_pending" states="open"/>
+                    <button type="action" string="Convert to Task" name="%(action_scrum_backlog_to_task)d" states="pending"/>
+                    <button type="object" string="Set to Draft" name="button_draft" states="cancel,done"/>
+                    <button type="object" string="Cancel" name="button_cancel" states="draft,open,pending"/>
                     <div class="oe_right">
                         <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
                     </div>
@@ -239,12 +239,12 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button type="object" string="Open" name="button_open" states="draft,pending" icon="terp-camera_test"/>
-                    <button type="object" string="Close" name="button_close" states="open,pending" icon="terp-dialog-close"/>
-                    <button type="object" string="Pending" name="button_pending" states="open" icon="gtk-media-pause"/>
+                    <button type="object" string="Open" name="button_open" states="draft,pending"/>
+                    <button type="object" string="Close" name="button_close" states="open,pending"/>
+                    <button type="object" string="Pending" name="button_pending" states="open"/>
                     <button name="%(project_scrum.report_scrum_sprint_burndown_chart)d"
-                                   string="Burndown Chart" type="action" icon="gtk-print"/>
-                    <button type="object" string="Set to Draft" name="button_draft" states="cancel,done" icon="gtk-convert"/>
+                                   string="Burndown Chart" type="action"/>
+                    <button type="object" string="Set to Draft" name="button_draft" states="cancel,done"/>
                     <div class="oe_right">
                         <field name="state" readonly="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
                     </div>
diff --git a/addons/purchase/purchase_view.xml b/addons/purchase/purchase_view.xml
index 9a024138beb..fe6c9b1d3f3 100644
--- a/addons/purchase/purchase_view.xml
+++ b/addons/purchase/purchase_view.xml
@@ -132,15 +132,15 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                    <button name="picking_ok" states="except_picking" string="Manually Corrected" icon="gtk-convert"/>
-                    <button name="invoice_ok" states="except_invoice" string="Manually Corrected" icon="gtk-convert"/>
-                    <button name="purchase_confirm" states="draft" string="Convert to Purchase Order" icon="gtk-go-forward"/>
-                    <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase" icon="gtk-ok"/>
-                    <button name="purchase_approve" states="confirmed" string="Approved" icon="gtk-go-forward"/>
-                    <button name="%(report_purchase_order)d" string="Print" states="approved" type="action" icon="gtk-print"/>
-                    <button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel Purchase Order" type="object" icon="gtk-cancel"/>
-                    <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel" icon="gtk-cancel"/>
+                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
+                    <button name="picking_ok" states="except_picking" string="Manually Corrected"/>
+                    <button name="invoice_ok" states="except_invoice" string="Manually Corrected"/>
+                    <button name="purchase_confirm" states="draft" string="Confirm Purchase"/>
+                    <button name="purchase_appbuyer" states="wait_auth" string="Approve Purchase"/>
+                    <button name="purchase_approve" states="confirmed" string="Approved"/>
+                    <button name="%(report_purchase_order)d" string="Print" states="approved" type="action"/>
+                    <button name="action_cancel" states="approved,except_picking,except_invoice,wait" string="Cancel" type="object"/>
+                    <button name="purchase_cancel" states="draft,confirmed,wait_auth" string="Cancel"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,approved,done" statusbar_colors='{"except_picking":"red","except_invoice":"red","confirmed":"blue","wait":"blue"}' readonly="1"/>
                     </div>
diff --git a/addons/purchase_requisition/purchase_requisition_view.xml b/addons/purchase_requisition/purchase_requisition_view.xml
index b7740c99202..d09564f221e 100644
--- a/addons/purchase_requisition/purchase_requisition_view.xml
+++ b/addons/purchase_requisition/purchase_requisition_view.xml
@@ -48,10 +48,10 @@
         <field name="arch" type="xml">
             <form layout="manual">
             <div class="oe_form_topbar">
-                <button name="tender_in_progress" states="draft" string="Start" type="object" icon="gtk-apply" />
-                <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" icon="gtk-convert" />
-                <button name="tender_done" states="in_progress" string="Done" type="object" icon="gtk-jump-to" />
-                <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" icon="gtk-cancel" />
+                <button name="tender_in_progress" states="draft" string="Start" type="object" />
+                <button name="tender_reset" states="done,cancel" string="Reset to Draft" type="object" />
+                <button name="tender_done" states="in_progress" string="Done" type="object" />
+                <button name="tender_cancel" states="draft,in_progress" string="Cancel" type="object" />
                 <div class="oe_right">
                     <field name="state" nolabel="1" select="1" readonly ="1" widget="statusbar" statusbar_visible="draft,in_progress,done" statusbar_colors='{"in_progress":"blue"}'/>
                 </div>
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 91b3abde65e..f19a6a58fec 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -96,20 +96,20 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="order_confirm" states="draft" string="Confirm Order" icon="gtk-apply"/>
-                    <button name="manual_invoice" states="manual" string="Create Final Invoice" icon="gtk-go-forward" type="object"/>
-                    <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice" icon="gtk-go-forward"/>
-                    <button name="invoice_corrected" states="invoice_except" string="Ignore Exception" icon="gtk-apply"/>
-                    <button name="ship_recreate" states="shipping_except" string="Recreate Packing" icon="gtk-ok"/>
-                    <button name="ship_corrected" states="shipping_except" string="Ignore Exception" icon="gtk-apply"/>
-                    <button name="%(report_sale_order)d" string="Print Order" type="action" icon="gtk-print" states="waiting_date,manual,progress,done,shipping_except,invoice_except"/>
-                    <button name="ship_cancel" states="shipping_except" string="Cancel Order" icon="gtk-cancel"/>
-                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                    <button name="invoice_cancel" states="invoice_except" string="Cancel Order" icon="gtk-cancel"/>
-                    <button name="%(report_sale_order)d" string="Print Quotation" type="action" icon="gtk-print" states="draft"/>
-                    <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" icon="gtk-execute" states="draft,manual"/>
-                    <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object" icon="gtk-cancel"/>
-                    <button name="cancel" states="draft" string="Cancel Order" icon="gtk-cancel"/>
+                    <button name="order_confirm" states="draft" string="Confirm Order"/>
+                    <button name="manual_invoice" states="manual" string="Create Final Invoice" type="object"/>
+                    <button name="invoice_recreate" states="invoice_except" string="Recreate Invoice"/>
+                    <button name="invoice_corrected" states="invoice_except" string="Ignore Exception"/>
+                    <button name="ship_recreate" states="shipping_except" string="Recreate Packing"/>
+                    <button name="ship_corrected" states="shipping_except" string="Ignore Exception"/>
+                    <button name="%(report_sale_order)d" string="Print Order" type="action" states="waiting_date,manual,progress,done,shipping_except,invoice_except"/>
+                    <button name="ship_cancel" states="shipping_except" string="Cancel Order"/>
+                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
+                    <button name="invoice_cancel" states="invoice_except" string="Cancel Order"/>
+                    <button name="%(report_sale_order)d" string="Print Quotation" type="action" states="draft"/>
+                    <button name="%(action_view_sale_advance_payment_inv)d" string="Advance Invoice" type="action" states="draft,manual"/>
+                    <button name="action_cancel" states="manual,progress" string="Cancel Order" type="object"/>
+                    <button name="cancel" states="draft" string="Cancel Order"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,progress,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                     </div>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 9365040aa0a..feff7d38e5d 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -110,10 +110,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="action_confirm" states="draft" string="Confirm Inventory" type="object" icon="gtk-apply"/>
-                    <button name="action_done" states="confirm" string="Validate Inventory" type="object" icon="gtk-jump-to"/>
-                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                    <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object" icon="gtk-cancel"/>
+                    <button name="action_confirm" states="draft" string="Confirm Inventory" type="object"/>
+                    <button name="action_done" states="confirm" string="Validate Inventory" type="object"/>
+                    <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object"/>
+                    <button name="action_cancel_inventory" states="draft,confirm,done" string="Cancel Inventory" type="object"/>
                     <div class="oe_right">
                          <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,confirm"/>
                     </div>
@@ -710,14 +710,14 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="draft_force_assign" states="draft" string="Confirm" type="object" icon="gtk-apply"/>
-                    <button name="draft_validate" states="draft" string="Confirm &amp; Transfer" type="object" icon="gtk-media-play"/>
-                    <!-- <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/> -->
-                    <button name="force_assign" states="confirmed" string="Force Availability" type="object" icon="gtk-jump-to"/>
-                    <button name="action_process" states="assigned" string="Confirm &amp; Transfer" groups="stock.group_stock_user" type="object" icon="gtk-go-forward"/>
-                    <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" icon="terp-gtk-go-back-rtl" />
-                    <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" icon="terp-gtk-go-back-rtl" />
-                    <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel" icon="gtk-cancel"/>
+                    <button name="draft_force_assign" states="draft" string="Confirm" type="object"/>
+                    <button name="draft_validate" states="draft" string="Confirm &amp; Transfer" type="object"/>
+                    <!-- <button name="action_assign" states="confirmed" string="Check Availability" type="object"/> -->
+                    <button name="force_assign" states="confirmed" string="Force Availability" type="object"/>
+                    <button name="action_process" states="assigned" string="Confirm &amp; Transfer" groups="stock.group_stock_user" type="object"/>
+                    <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" />
+                    <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action" />
+                    <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                     </div>
@@ -930,12 +930,12 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='%(act_stock_return_picking)d']" position="replace">
-                        <button name="%(report_picking_list_out)d" string="Print Delivery Slip" type="action" icon="gtk-print" states="done"/>
-                        <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="terp-gtk-go-back-rtl" />
+                        <button name="%(report_picking_list_out)d" string="Print Delivery Slip" type="action" states="done"/>
+                        <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" />
                     </xpath>
                     <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='draft_validate']" position="replace">
-                        <button name="draft_validate" states="draft" string="Confirm &amp; Deliver" type="object" icon="gtk-media-play"/>
-                        <button name="action_assign" states="confirmed" string="Check Availability" type="object" icon="gtk-find"/>
+                        <button name="draft_validate" states="draft" string="Confirm &amp; Deliver" type="object"/>
+                        <button name="action_assign" states="confirmed" string="Check Availability" type="object"/>
                     </xpath>
                     <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='action_process']" position="replace">
                         <button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward"/>
@@ -1051,13 +1051,13 @@
             <field name="arch" type="xml">
                 <data>
                     <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='%(act_stock_return_picking)d']" position="replace">
-                        <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" icon="terp-gtk-go-back-rtl" />
+                        <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action" />
                     </xpath>
                     <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='draft_validate']" position="replace">
-                        <button name="draft_validate" states="draft" string="Confirm &amp; Receive" type="object" icon="gtk-media-play"/>
+                        <button name="draft_validate" states="draft" string="Confirm &amp; Receive" type="object"/>
                     </xpath>
                     <xpath expr="/form/div[@class='oe_form_topbar']/button[@name='action_process']" position="replace">
-                        <button name="action_process" states="assigned" string="Receive" type="object" icon="gtk-go-forward"/>
+                        <button name="action_process" states="assigned" string="Receive" type="object"/>
                     </xpath>
                     <xpath expr="/form/sheet/group/group/field[@name='partner_id']" position="replace">
                         <field name="partner_id" on_change="onchange_partner_in(partner_id)"  colspan="4" string="Supplier"/>
@@ -1199,10 +1199,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
-                    <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object" icon="gtk-jump-to"/>
-                    <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
-                    <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
+                    <button name="action_confirm" states="draft" string="Process Later" type="object"/>
+                    <button name="action_done" states="draft,assigned,confirmed" string="Process Now" type="object"/>
+                    <button name="force_assign" states="confirmed" string="Set Available" type="object"/>
+                    <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
                     </div>
@@ -1388,10 +1388,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="action_confirm" states="draft" string="Process Later" type="object" icon="gtk-apply"/>
-                    <button name="force_assign" states="confirmed" string="Set Available" type="object" icon="gtk-yes"/>
-                    <button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned" icon="gtk-go-forward"/>
-                    <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object" icon="gtk-cancel"/>
+                    <button name="action_confirm" states="draft" string="Process Later" type="object"/>
+                    <button name="force_assign" states="confirmed" string="Set Available" type="object"/>
+                    <button name="%(action_partial_move_server)d" string="Process" type="action" states="assigned"/>
+                    <button name="action_cancel" states="assigned,confirmed" string="_Cancel" type="object"/>
                     <div class="oe_right">
                         <field name="state" nolabel="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"waiting":"blue","confirmed":"blue"}'/>
                     </div>
diff --git a/addons/stock_planning/stock_planning_view.xml b/addons/stock_planning/stock_planning_view.xml
index 969537a0005..e3e65d9fa0d 100644
--- a/addons/stock_planning/stock_planning_view.xml
+++ b/addons/stock_planning/stock_planning_view.xml
@@ -14,8 +14,8 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="button_open" string="Open" icon="gtk-ok" states="draft" type="object"/>
-                    <button name="button_close" string="Close" icon="gtk-stop" states="open" type="object"/>
+                    <button name="button_open" string="Open" states="draft" type="object"/>
+                    <button name="button_close" string="Close" states="open" type="object"/>
                     <div class="oe_right">
                         <field name="state" select="1" widget="statusbar" nolabel="1" statusbar_visible="draft,open"/>
                     </div>
@@ -87,7 +87,7 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="action_validate" icon="gtk-apply" string="Approve" states="draft" type="object" />
+                    <button name="action_validate" string="Approve" states="draft" type="object" />
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1"/>
                     </div>
diff --git a/addons/subscription/subscription_view.xml b/addons/subscription/subscription_view.xml
index f3bca1e6f0a..abc06c829bd 100644
--- a/addons/subscription/subscription_view.xml
+++ b/addons/subscription/subscription_view.xml
@@ -15,9 +15,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="set_process" states="draft" string="Process" type="object" icon="gtk-go-forward"/>
-                    <button name="set_done" states="running" string="Stop" type="object" icon="gtk-stop"/>
-                    <button name="set_draft" states="done" string="Set to Draft" type="object" icon="gtk-convert"/>
+                    <button name="set_process" states="draft" string="Process" type="object"/>
+                    <button name="set_done" states="running" string="Stop" type="object"/>
+                    <button name="set_draft" states="done" string="Set to Draft" type="object"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,running"/>
                     </div>
diff --git a/addons/survey/survey_view.xml b/addons/survey/survey_view.xml
index 63d2fe6c8c0..644f5c76a2a 100644
--- a/addons/survey/survey_view.xml
+++ b/addons/survey/survey_view.xml
@@ -20,9 +20,9 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="survey_open" string="Open" states="cancel,close" type="object" icon="gtk-go-forward"/>
-                    <button name="survey_close" string="Close" states="open" type="object" icon="gtk-close"/>
-                    <button name="survey_cancel" string="Cancel" states="open" type="object" icon="gtk-cancel"/>
+                    <button name="survey_open" string="Open" states="cancel,close" type="object"/>
+                    <button name="survey_close" string="Close" states="open" type="object"/>
+                    <button name="survey_cancel" string="Cancel" states="open" type="object"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="open,close"/>
                     </div>
@@ -1061,10 +1061,10 @@
             <field name="arch" type="xml">
                 <form layout="manual">
                 <div class="oe_form_topbar">
-                    <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object" icon="gtk-new"/>
-                    <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object" icon="gtk-new"/>
-                    <button name="survey_req_done" string="Done" states="waiting_answer" type="object" icon="gtk-ok"/>
-                    <button name="survey_req_cancel" string="Cancel" states="waiting_answer" type="object" icon="gtk-cancel"/>
+                    <button name="survey_req_draft" string="Set to Draft" states="cancel,done" type="object"/>
+                    <button name="survey_req_waiting_answer" string="Waiting Answer" states="draft" type="object"/>
+                    <button name="survey_req_done" string="Done" states="waiting_answer" type="object"/>
+                    <button name="survey_req_cancel" string="Cancel" states="waiting_answer" type="object"/>
                     <div class="oe_right">
                         <field name="state" widget="statusbar" nolabel="1" statusbar_visible="draft,waiting_answer"/>
                     </div>