diff --git a/addons/account/account_invoice_view.xml b/addons/account/account_invoice_view.xml
index ac82fc1b6cc..22df9059305 100644
--- a/addons/account/account_invoice_view.xml
+++ b/addons/account/account_invoice_view.xml
@@ -138,7 +138,7 @@
 
                     <button name="invoice_open" states="draft,proforma2" string="Approve" icon="terp-camera_test"/>
                     <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
-                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="terp-gtk-stop"/>
+                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                     <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='open,paid' icon="gtk-execute"/>
                 </tree>
@@ -216,7 +216,7 @@
                                     <button name="%(action_account_invoice_refund)d" type='action' string='Credit Note' states='open,paid' icon="gtk-execute"/>
                                     <button name="%(action_account_invoice_pay)d" type='action' string='Pay Invoice' states='open' icon="gtk-ok"/>
                                     <button name="%(action_account_state_open)d" type='action' string='Re-Open' states='paid' icon="gtk-convert"/>
-                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="terp-gtk-stop"/>
+                                    <button name="invoice_cancel" states="draft,proforma2,sale,open" string="Cancel" icon="gtk-cancel"/>
                                     <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="terp-stock_effects-object-colorize"/>
                                 </group>
                             </group>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 3ae70200ffb..99c29ef18b9 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -455,7 +455,7 @@
                     <field name="state"/>
                     <button type="object" string="Open" name="button_open" states="draft" icon="terp-camera_test"/>
                     <button type="object" string="Confirm" name="button_confirm_bank" states="open" icon="terp-gtk-go-back-rtl"/>
-                    <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="terp-gtk-stop"/>
+                    <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="gtk-cancel"/>
                 </tree>
             </field>
         </record>
@@ -535,7 +535,7 @@
                         <field name="balance_end"/>
                         <button name="button_dummy" states="draft" string="Compute" icon="terp-stock_format-scientific"/>
                         <button name="button_confirm_bank" states="draft" string="Confirm" type="object"  icon="terp-camera_test"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="terp-gtk-stop"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>
@@ -1261,7 +1261,7 @@
                             <group col="4" colspan="4">
                                 <field name="state" select="1"/>
                                 <button name="button_validate" states="draft" string="Approve" type="object" icon="terp-camera_test"/>
-                                <button name="button_cancel" states="posted" string="Cancel" type="object" icon="terp-gtk-stop"/>
+                                <button name="button_cancel" states="posted" string="Cancel" type="object" icon="gtk-cancel"/>
                             </group>
                         </page>
                     </notebook>
@@ -1481,7 +1481,7 @@
                         <field name="balance_end"/>
                         <button name="button_dummy" states="draft" string="Compute" icon="terp-stock_format-scientific"/>
                         <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-camera_test"/>
-                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="terp-gtk-stop"/>
+                        <button name="button_cancel" states="confirm" string="Cancel" type="object" icon="gtk-cancel"/>
                     </group>
                 </form>
             </field>
@@ -2433,7 +2433,7 @@
                     <field name="state"/>
                     <button type="object" string="Open" name="button_open" states="draft" icon="terp-camera_test"/>
                     <button type="object" string="Confirm" name="button_confirm_bank" states="open" icon="terp-gtk-go-back-rtl"/>
-                    <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="terp-gtk-stop"/>
+                    <button type="object" string="Cancel" name="button_cancel" states="confirm" icon="gtk-cancel"/>
                 </tree>
             </field>
         </record>
@@ -2537,7 +2537,7 @@
                         <field name="state" colspan="4"/>
                         <button name="button_confirm_cash" states="open" string="Close CashBox" icon="terp-check" type="object"/>
                         <button name="button_open" states="draft" string="Open CashBox" icon="terp-document-new" type="object"/>
-                        <button name="button_cancel" states="confirm,open" string="Cancel" icon="terp-gtk-stop" type="object" groups="base.group_extended"/>
+                        <button name="button_cancel" states="confirm,open" string="Cancel" icon="gtk-cancel" type="object" groups="base.group_extended"/>
                     </group>
                 </form>
             </field>
diff --git a/addons/account/wizard/account_invoice_state_view.xml b/addons/account/wizard/account_invoice_state_view.xml
index 1fd466a9dce..7130e7dc758 100644
--- a/addons/account/wizard/account_invoice_state_view.xml
+++ b/addons/account/wizard/account_invoice_state_view.xml
@@ -44,7 +44,7 @@
                 <separator string="Cancel Selected Invoices" colspan="4"/>
                     <group colspan="4" col="6">
                         <button icon="terp-dialog-close" special="cancel" string="Close"/>
-                        <button icon="terp-gtk-stop" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
+                        <button icon="gtk-cancel" string="Cancel Invoices" name="invoice_cancel" type="object" default_focus="1"/>
                    </group>
                </form>
             </field>
diff --git a/addons/account/wizard/account_journal_select_view.xml b/addons/account/wizard/account_journal_select_view.xml
index 4fc94ec0d6c..f5df24fa585 100644
--- a/addons/account/wizard/account_journal_select_view.xml
+++ b/addons/account/wizard/account_journal_select_view.xml
@@ -11,7 +11,7 @@
                         <label string="Are you sure you want to open Journal Entries?" colspan="4"/>
                            <separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     	<button icon="terp-gtk-go-back-rtl" string="Open Entries" name="action_open_window" type="object"/>
                    </group>
                </form>
diff --git a/addons/account/wizard/account_move_bank_reconcile_view.xml b/addons/account/wizard/account_move_bank_reconcile_view.xml
index b80e17f18c8..d41993733df 100644
--- a/addons/account/wizard/account_move_bank_reconcile_view.xml
+++ b/addons/account/wizard/account_move_bank_reconcile_view.xml
@@ -13,7 +13,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     	<button icon="terp-gtk-go-back-rtl" string="Open for bank reconciliation" name="action_open_window" type="object"/>
                    </group>
                 </form>
diff --git a/addons/account/wizard/account_move_journal_view.xml b/addons/account/wizard/account_move_journal_view.xml
index af9dd313255..d766153a9b4 100644
--- a/addons/account/wizard/account_move_journal_view.xml
+++ b/addons/account/wizard/account_move_journal_view.xml
@@ -16,7 +16,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     	<button icon="terp-gtk-go-back-rtl" string="Open Journal" name="action_open_window" type="object"/>
                    	</group>
                </form>
diff --git a/addons/account/wizard/account_move_line_reconcile_select_view.xml b/addons/account/wizard/account_move_line_reconcile_select_view.xml
index 4f88f618727..22bc289f816 100644
--- a/addons/account/wizard/account_move_line_reconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_reconcile_select_view.xml
@@ -13,7 +13,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel" />
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel" />
 						<button icon="terp-gtk-go-back-rtl"
 							string="Open for Reconciliation" name="action_open_window"
 							type="object" />
diff --git a/addons/account/wizard/account_move_line_select_view.xml b/addons/account/wizard/account_move_line_select_view.xml
index 8c462318271..645b5a098e3 100644
--- a/addons/account/wizard/account_move_line_select_view.xml
+++ b/addons/account/wizard/account_move_line_select_view.xml
@@ -11,7 +11,7 @@
                     <label string="Are you sure you want to open Account move line entries!" colspan="4"/>
                     <separator string="" colspan="4" />
                     <group colspan="4" col="6">
-                        <button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="terp-gtk-go-back-rtl" string="Open Entries" name="open_window" type="object" default_focus="1"/>
                    </group>
                </form>
diff --git a/addons/account/wizard/account_move_line_unreconcile_select_view.xml b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
index f2a3882db91..ae1b069a1dc 100644
--- a/addons/account/wizard/account_move_line_unreconcile_select_view.xml
+++ b/addons/account/wizard/account_move_line_unreconcile_select_view.xml
@@ -13,7 +13,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel" />
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel" />
 						<button icon="terp-gtk-go-back-rtl"
 							string="Open For Unreconciliation" name="action_open_window"
 							type="object" />
diff --git a/addons/account/wizard/account_open_closed_fiscalyear_view.xml b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
index afc7b7e6828..435f15388c1 100644
--- a/addons/account/wizard/account_open_closed_fiscalyear_view.xml
+++ b/addons/account/wizard/account_open_closed_fiscalyear_view.xml
@@ -13,7 +13,7 @@
                        	<separator string="" colspan="4" />
                     <group colspan="4" col="6">
                        	<label string ="" colspan="2"/>
-                    	<button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
+                    	<button icon="gtk-cancel" special="cancel" string="Cancel"/>
                     	<button icon="terp-gtk-go-back-rtl" string="Open" name="remove_entries" type="object"/>
                     </group>
                 </form>
diff --git a/addons/account/wizard/account_partner_balance_report_view.xml b/addons/account/wizard/account_partner_balance_report_view.xml
index 4827fac5480..abbddcd5074 100644
--- a/addons/account/wizard/account_partner_balance_report_view.xml
+++ b/addons/account/wizard/account_partner_balance_report_view.xml
@@ -33,7 +33,7 @@
      				<group colspan="4" col="6">
                        	<separator colspan="4"/>
                        	<newline/>
-     					<button special="cancel" string="Cancel" icon="terp-gtk-stop"/>
+     					<button special="cancel" string="Cancel" icon="gtk-cancel"/>
                			<button name="check_state" string="Print" type="object" icon="gtk-print"/>
  					</group>
  					</group>
diff --git a/addons/account/wizard/account_use_model_view.xml b/addons/account/wizard/account_use_model_view.xml
index 6bae6c55d74..f4cd436c9a2 100644
--- a/addons/account/wizard/account_use_model_view.xml
+++ b/addons/account/wizard/account_use_model_view.xml
@@ -70,7 +70,7 @@
                     <group colspan="4" col="6" width="300" height="70">
                            <label string = "Are you sure you want to create entries?" colspan="2"/>
                            <newline/>
-                        <button icon="terp-gtk-stop" special="cancel" string="Cancel"/>
+                        <button icon="gtk-cancel" special="cancel" string="Cancel"/>
                         <button icon="gtk-execute" string="Ok" name="create_entries" type="object" default_focus='1'/>
                    </group>
                </form>
diff --git a/addons/account_voucher/voucher_view.xml b/addons/account_voucher/voucher_view.xml
index 46e1f7342c1..aaebfe4c09d 100644
--- a/addons/account_voucher/voucher_view.xml
+++ b/addons/account_voucher/voucher_view.xml
@@ -89,7 +89,7 @@
                         <filter icon="terp-check" string="Proforma" domain="[('state','=','proforma')]" help="Proforma Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','posted')]" help="Posted Vouchers"/>
                         <filter icon="terp-stock_effects-object-colorize" string="Reviewed" domain="[('state','=','audit')]" groups="base.group_extended" help="To Review"/>
-                        <filter icon="terp-gtk-stop" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers" groups="base.group_extended"/>
+                        <filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
                         <field name="reference" select="1"/>
                         <field name="number" select='1'/>
@@ -126,7 +126,7 @@
                         <filter icon="terp-check" string="Proforma" domain="[('state','=','proforma')]" help="Proforma Vouchers"/>
                         <filter icon="terp-camera_test" string="Posted" domain="[('state','=','audit')]" help="Posted Vouchers"/>
                         <filter icon="terp-stock_effects-object-colorize" string="To Review" domain="[('state','=','posted')]" groups="base.group_extended" help="To Review"/>
-                        <filter icon="terp-gtk-stop" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers" groups="base.group_extended"/>
+                        <filter icon="gtk-cancel" string="Cancel" domain="[('state','=','cancel')]" help="Cancel Vouchers" groups="base.group_extended"/>
                         <separator orientation="vertical"/>
                         <field name="reference" select="1"/>
                         <field name="number" select='1'/>
diff --git a/addons/crm_claim/report/crm_claim_report_view.xml b/addons/crm_claim/report/crm_claim_report_view.xml
index 45aec4ead2b..7bde655a980 100644
--- a/addons/crm_claim/report/crm_claim_report_view.xml
+++ b/addons/crm_claim/report/crm_claim_report_view.xml
@@ -167,7 +167,7 @@
                     		string="Done"
                     		domain="[('state','=','done')]"/>
 
-                    	<filter icon="terp-gtk-stop"
+                    	<filter icon="gtk-cancel"
                     		string="Cancel"
                     		domain="[('state','=','cancel')]"/>
 
diff --git a/addons/crm_fundraising/report/crm_fundraising_report_view.xml b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
index 94bf096c622..8029a5574d3 100644
--- a/addons/crm_fundraising/report/crm_fundraising_report_view.xml
+++ b/addons/crm_fundraising/report/crm_fundraising_report_view.xml
@@ -158,7 +158,7 @@
                     		string="Done"
                     		domain="[('state','=','done')]"/>
 
-                    	<filter icon="terp-gtk-stop"
+                    	<filter icon="gtk-cancel"
                     		string="Cancel"
                     		domain="[('state','=','cancel')]"/>
 
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index 9f7b3a43cfc..a2a7b104ea6 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -56,7 +56,7 @@
 	                	help = "Draft and Confirmed leaves"/>
 	               	<filter string="Validated" icon="terp-camera_test" domain="[('state','=','validate')]"
 	               		help = "Pending Leaves"/>
-                  <filter icon="terp-gtk-stop" string="Cancelled" domain="[('state','=','cancel')]"/>
+                  <filter icon="gtk-cancel" string="Cancelled" domain="[('state','=','cancel')]"/>
 					<separator orientation="vertical"/>
                     <field name="department_id"/>
 					<field name="employee_id"/>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index cc28c24c5ee..be04a9d5186 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -180,7 +180,7 @@
                     <group col="4" colspan="2">
                         <button name="button_confirm" states="draft" string="Confirm" type="object" icon="terp-gtk-jump-to-rtl"/>
                         <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="terp-gtk-stop"/>
+                        <button name="cancel" states="confirm" string="Refuse" type="workflow" icon="gtk-cancel"/>
                         <button name="done" states="confirm" string="Accept" type="workflow" icon="terp-camera_test"/>
                     </group>
                 </form>
diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 07f996942c5..5d0fe20c801 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -62,7 +62,7 @@
                               name="%(action_lunch_order_cancel)d"
                               string="Cancel Order"
                               type="action" states="confirmed"
-                              icon="terp-gtk-stop" />
+                              icon="gtk-cancel" />
                 </tree>
             </field>
         </record>