diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index e7783757534..4b1d10380fb 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -643,12 +643,12 @@
                             <group col="9" colspan="4">
                                 <field name="state"/>
                                 <button name="action_compute" states="draft" string="Compute Data" type="object" icon="terp-stock_format-scientific"/>
-                                <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_cancel" states="draft,ready,confirmed,in_production,picking_except" string="Cancel" icon="gtk-stop"/>
-                                <button name="button_recreate" states="picking_except" string="Recreate Picking" icon="terp-document-new"/>
+                                <button name="button_confirm" states="draft" string="Co_nfirm Production" icon="gtk-apply"/>
+                                <button name="button_produce" states="ready" string="S_tart Production" icon="terp-gtk-jump-to-ltr"/>
+                                <button name="%(act_mrp_product_produce)d" states="in_production" string="Pro_duce" 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_cancel" states="draft,ready,confirmed,in_production,picking_except" string="_Cancel" icon="gtk-stop"/>
+                                <button name="button_recreate" states="picking_except" string="Recreate P_icking" icon="terp-document-new"/>
                             </group>
                         </page>
                         <page string="Finished Products">
diff --git a/addons/mrp/wizard/change_production_qty_view.xml b/addons/mrp/wizard/change_production_qty_view.xml
index a9125afe41b..f16f749394e 100644
--- a/addons/mrp/wizard/change_production_qty_view.xml
+++ b/addons/mrp/wizard/change_production_qty_view.xml
@@ -16,9 +16,9 @@
 				    <newline/>
 				    <separator colspan="4"/>
 				    <group col="2" colspan="4">
-                		<button icon='gtk-close' special="cancel"
-                			string="Close" />
-                		<button name="change_prod_qty" string="Approve"
+                		<button icon='gtk-stop' special="cancel"
+                			string="_Cancel" />
+                		<button name="change_prod_qty" string="_Approve"
                 			colspan="1" type="object" icon="gtk-ok" />
                 	</group>
                 </form>
diff --git a/addons/mrp/wizard/mrp_price_view.xml b/addons/mrp/wizard/mrp_price_view.xml
index 758d0bc5415..34e58c1915f 100644
--- a/addons/mrp/wizard/mrp_price_view.xml
+++ b/addons/mrp/wizard/mrp_price_view.xml
@@ -15,9 +15,9 @@
 				    <newline/>
                     <separator string="" colspan="4"/>
 				    <group col="2" colspan="4">
-                		<button icon='gtk-close' special="cancel"
-                			string="Close" />
-                		<button name="print_report" string="Print"
+                		<button icon='gtk-stop' special="cancel"
+                			string="_Cancel" />
+                		<button name="print_report" string="_Print"
                 			colspan="1" type="object" icon="gtk-print" />
                 	</group>
                 </form>
diff --git a/addons/mrp/wizard/mrp_product_produce_view.xml b/addons/mrp/wizard/mrp_product_produce_view.xml
index f2040049056..bf4397a621c 100644
--- a/addons/mrp/wizard/mrp_product_produce_view.xml
+++ b/addons/mrp/wizard/mrp_product_produce_view.xml
@@ -18,9 +18,9 @@
                 	<separator string="" colspan="4" />
                 	<label string="" colspan="2" />
                 	<group col="2" colspan="1">
-                		<button icon='gtk-close' special="cancel"
-                			string="Close" />
-                		<button name="do_produce" string="Confirm"
+                		<button icon='gtk-stop' special="cancel"
+                			string="_Cancel" />
+                		<button name="do_produce" string="Con_firm"
                 			colspan="1" type="object" icon="gtk-ok" />
                 	</group>
                 </form>
diff --git a/addons/mrp/wizard/mrp_workcenter_load_view.xml b/addons/mrp/wizard/mrp_workcenter_load_view.xml
index baae314d04c..745009fc790 100644
--- a/addons/mrp/wizard/mrp_workcenter_load_view.xml
+++ b/addons/mrp/wizard/mrp_workcenter_load_view.xml
@@ -15,10 +15,10 @@
 				    <field name="measure_unit"/>
 				    <newline/>
 				    <group col="2" colspan="4">
-                		<button icon='gtk-close' special="cancel"
-                			string="Close" />
-                		<button name="print_report" string="Print"
-                			colspan="1" type="object" icon="gtk-ok" />
+                		<button icon='gtk-stop' special="cancel"
+                			string="_Cancel" />
+                		<button name="print_report" string="_Print"
+                			colspan="1" type="object" icon="gtk-print" />
                 	</group>
 				</form>
 			</field>
diff --git a/addons/mrp_operations/mrp_operations_view.xml b/addons/mrp_operations/mrp_operations_view.xml
index 43ff257c819..9ced1a2817e 100644
--- a/addons/mrp_operations/mrp_operations_view.xml
+++ b/addons/mrp_operations/mrp_operations_view.xml
@@ -32,12 +32,12 @@
         <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
         <field name="arch" type="xml">
            <xpath expr="/form/notebook/page/field[@name='workcenter_lines']/tree/field[@name='hour']" position="after">
-                <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
-                <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_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop"/>
-                <button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause"/>
-                <button name="button_done" string="Finished" states="startworking" icon="terp-dialog-close"/>
+                <button name="button_draft" string="Set _Draft" states="cancel" icon="gtk-convert"/>
+                <button name="button_start_working" string="S_tart" states="draft" icon="terp-gtk-jump-to-ltr"/>
+                <button name="button_resume" string="_Resume" states="pause" icon="gtk-media-pause"/>
+                <button name="button_cancel" string="_Cancel" states="draft,startworking" icon="gtk-stop"/>
+                <button name="button_pause" string="P_ause" states="startworking" icon="gtk-media-pause"/>
+                <button name="button_done" string="F_inished" states="startworking" icon="terp-dialog-close"/>
                 <field name="state"/>
            </xpath>
         </field>
@@ -114,12 +114,12 @@
                     <separator string="" colspan="4"/>
                     <group colspan="8" col="8">
                         <field name="state"/>
-                        <button name="button_draft" string="Set Draft" states="cancel" icon="gtk-convert"/>
-                        <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_cancel" string="Cancel" states="draft,startworking" icon="gtk-stop"/>
-                        <button name="button_pause" string="Pause" states="startworking" icon="gtk-media-pause"/>
-                        <button name="button_done" string="Finished" states="startworking" icon="terp-dialog-close"/>
+                        <button name="button_draft" string="Set _Draft" states="cancel" icon="gtk-convert"/>
+                        <button name="button_start_working" string="S_tart" states="draft" icon="terp-gtk-jump-to-ltr"/>
+                        <button name="button_resume" string="_Resume" states="pause" icon="gtk-media-pause"/>
+                        <button name="button_cancel" string="_Cancel" states="draft,startworking" icon="gtk-stop"/>
+                        <button name="button_pause" string="P_ause" states="startworking" icon="gtk-media-pause"/>
+                        <button name="button_done" string="F_inished" states="startworking" icon="terp-dialog-close"/>
                     </group>
                 </page>
                 </notebook>
diff --git a/addons/mrp_repair/mrp_repair_view.xml b/addons/mrp_repair/mrp_repair_view.xml
index 7ae6870f201..75658ab1534 100644
--- a/addons/mrp_repair/mrp_repair_view.xml
+++ b/addons/mrp_repair/mrp_repair_view.xml
@@ -98,17 +98,17 @@
                         <separator string="" colspan="4"/>
                         <group col="13" colspan="4">
                             <field name="state"/>
-                            <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_repair_end" states="under_repair" string="End Repair" icon="terp-dialog-close"/>
-                            <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_invoice_create" states="2binvoiced" string="Make Invoice" icon="terp-dolar"/>
-                            <button name="%(action_cancel_repair)d" states="invoice_except" string="Cancel Repair" type="action" icon="gtk-stop"/>
-                            <button name="action_cancel_draft" states="cancel" string="Set to Draft" type="object" icon="gtk-convert"/>
-                            <button name="cancel" states="draft" string="Cancel Repair" icon="gtk-stop"/>
-                            <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="Cancel Repair" type="action" icon="gtk-stop"/>
+                            <button name="repair_confirm" states="draft" string="Co_nfirm 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_repair_end" states="under_repair" string="_End Repair" icon="terp-dialog-close"/>
+                            <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_invoice_create" states="2binvoiced" string="Make _Invoice" icon="terp-dolar"/>
+                            <button name="%(action_cancel_repair)d" states="invoice_except" string="_Cancel Repair" type="action" icon="gtk-stop"/>
+                            <button name="action_cancel_draft" states="cancel" string="Set to _Draft" type="object" icon="gtk-convert"/>
+                            <button name="cancel" states="draft" string="_Cancel Repair" icon="gtk-stop"/>
+                            <button name="%(action_cancel_repair)d" states="confirmed,2binvoiced,ready,under_repair" string="_Cancel Repair" type="action" icon="gtk-stop"/>
                         </group>
                     </page>
                     <page string="Invoicing">
diff --git a/addons/mrp_repair/wizard/cancel_repair.py b/addons/mrp_repair/wizard/cancel_repair.py
index de6e8095569..658adef8e9e 100644
--- a/addons/mrp_repair/wizard/cancel_repair.py
+++ b/addons/mrp_repair/wizard/cancel_repair.py
@@ -69,8 +69,8 @@ class repair_cancel(osv.osv_memory):
                             <group col="2" colspan="2">
                                 <label string="Do you want to continue?" colspan="4"/>
                                 <separator colspan="4"/>
-                                <button icon="gtk-cancel" special="cancel" string="No" readonly="0"/>
-                                <button name="cancel_repair" string="Yes" type="object" icon="gtk-ok"/>
+                                <button icon="gtk-stop" special="cancel" string="_No" readonly="0"/>
+                                <button name="cancel_repair" string="_Yes" type="object" icon="gtk-ok"/>
                             </group>
                         </form>                             
                     """
diff --git a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
index 4af2a3394b0..811551aedbf 100644
--- a/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_cancel_view.xml
@@ -13,9 +13,9 @@
 				    <label string="This operation will cancel the Repair process, but will not cancel it's Invoice. Do you want to continue?" colspan="4"/>
 				    <newline/>
 				    <group col="2" colspan="4">
-                		<button icon='gtk-cancel' special="cancel"
-                			string="No" />
-                		<button name="cancel_repair" string="Yes"
+                		<button icon="gtk-stop" special="cancel"
+                			string="_No" />
+                		<button name="cancel_repair" string="_Yes"
                 			colspan="1" type="object" icon="gtk-ok" />
                 	</group>
                 </form>
diff --git a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
index 407a5659471..62edf984b20 100644
--- a/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
+++ b/addons/mrp_repair/wizard/mrp_repair_make_invoice_view.xml
@@ -14,8 +14,8 @@
 			        <field name="group"/>
                     <newline/>  
                     <group col="2" colspan="4">                        
-                		<button icon='gtk-stop' special="cancel"
-                			string="_Close" />
+                		<button icon="gtk-stop" special="cancel"
+                			string="_Cancel" />
                 		<button name="make_invoices" string="Create _Invoice"
                 			colspan="1" type="object" icon="terp-dolar" />
                 	</group>