diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index ba8418eaec0..6897a3d1a23 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -165,7 +165,7 @@
                                 string="Reply"
                                 name="%(crm.action_crm_send_mail)d"
                                 context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
-                                icon="gtk-undo" type="action" />
+                                icon="terp-mail-replied" type="action" />
                         </tree>
                         <form string="Communication history">
                             <group col="4" colspan="4">
@@ -187,16 +187,16 @@
                                 string="Reply"
                                 name="%(crm.action_crm_send_mail)d"
                                 context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
-                                icon="gtk-undo" type="action" />
+                                icon="terp-mail-replied" type="action" />
                         </form>
                     </field>
                     <button colspan="2" string="Send New Email"
                         name="%(crm.action_crm_send_mail)d"
                         context="{'mail':'new', 'model': 'crm.lead'}"
-                        icon="gtk-go-forward" type="action" />
+                        icon="terp-mail-message-new" type="action" />
                     <button colspan="2" string="Forward"
                         name="%(crm_lead_forward_to_partner_act)d"
-                        icon="gtk-go-forward" type="action" />
+                        icon="terp-mail-forward" type="action" />
                  </page>
                 </notebook>
             </form>
diff --git a/addons/crm/crm_opportunity_view.xml b/addons/crm/crm_opportunity_view.xml
index 4eaaac03cea..a598466865c 100644
--- a/addons/crm/crm_opportunity_view.xml
+++ b/addons/crm/crm_opportunity_view.xml
@@ -127,7 +127,7 @@
                                         string="Reply"
                                         name="%(crm.action_crm_send_mail)d"
                                         context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
-                                        icon="gtk-undo" type="action" />
+                                        icon="terp-mail-replied" type="action" />
                                 </tree>
                                 <form string="Communication history">
                                     <group col="4" colspan="4">
@@ -149,16 +149,16 @@
                                         string="Reply"
                                         name="%(crm.action_crm_send_mail)d"
                                         context="{'mail':'reply', 'model': 'crm.lead', 'include_original' : True}"
-                                        icon="gtk-undo" type="action" />
+                                        icon="terp-mail-replied" type="action" />
                                 </form>
                             </field>
                             <button colspan="2" string="Send New Email"
                                 name="%(crm.action_crm_send_mail)d"
                                 context="{'mail':'new', 'model': 'crm.lead'}"
-                                icon="gtk-go-forward" type="action" />
+                                icon="terp-mail-message-new" type="action" />
                             <button colspan="2" string="Forward to Partner"
                                 name="%(crm_lead_forward_to_partner_act)d"
-                                icon="gtk-go-forward" type="action" />
+                                icon="terp-mail-forward" type="action" />
                         </page>
                         <page string="Extra Info" groups="base.group_extended">
                             <group col="2" colspan="2">
diff --git a/addons/crm/crm_view.xml b/addons/crm/crm_view.xml
index b968c0c1370..7e4eee1a469 100644
--- a/addons/crm/crm_view.xml
+++ b/addons/crm/crm_view.xml
@@ -556,7 +556,7 @@
 		                                string="Reply"
 		                                name="%(crm.action_crm_send_mail)d"
 		                                context="{'mail':'reply', 'model': 'crm.case.custom', 'include_original' : True}"
-		                                icon="gtk-undo" type="action" />
+		                                icon="terp-mail-replied" type="action" />
 		                        </tree>
 		                        <form string="Communication history">
 		                            <group col="4" colspan="4">
@@ -578,16 +578,16 @@
 		                                string="Reply"
 		                                name="%(crm.action_crm_send_mail)d"
 		                                context="{'mail':'reply', 'model': 'crm.case.custom', 'include_original' : True}"
-		                                icon="gtk-undo" type="action" />
+		                                icon="terp-mail-replied" type="action" />
 		                        </form>
 		                    </field>
                             <button colspan="2" string="Send New Email"
                                 name="%(crm.action_crm_send_mail)d"
                                 context="{'mail':'new', 'model': 'crm.case.custom'}"
-                                icon="gtk-go-forward" type="action" />
+                                icon="terp-mail-message-new" type="action" />
                             <button colspan="2" string="Forward to Partner"
                                 name="%(crm_lead_forward_to_partner_act)d"
-                                icon="gtk-go-forward" type="action" />
+                                icon="terp-mail-forward" type="action" />
                          </page>
                     </notebook>
                 </form>
diff --git a/addons/crm_claim/crm_claim_view.xml b/addons/crm_claim/crm_claim_view.xml
index 7357ef14039..2371a29b06a 100644
--- a/addons/crm_claim/crm_claim_view.xml
+++ b/addons/crm_claim/crm_claim_view.xml
@@ -175,7 +175,7 @@
                                             string="Reply"
                                             name="%(crm.action_crm_send_mail)d"
                                             context="{'mail':'reply', 'model': 'crm.claim', 'include_original' : True}"
-                                            icon="gtk-undo" type="action" />
+                                            icon="terp-mail-replied" type="action" />
                                     </tree>
                                     <form string="Communication history">
                                         <group col="4" colspan="4">
@@ -197,7 +197,7 @@
                                             string="Reply"
                                             name="%(crm.action_crm_send_mail)d"
                                             context="{'mail':'reply', 'model': 'crm.claim', 'include_original' : True}"
-                                            icon="gtk-undo" type="action" />
+                                            icon="terp-mail-replied" type="action" />
                                     </form>
                                 </field>
                                 <button colspan="4" string="Send New Email"
diff --git a/addons/crm_fundraising/crm_fundraising_view.xml b/addons/crm_fundraising/crm_fundraising_view.xml
index 1b2a1bdc6d2..7368bb5e349 100644
--- a/addons/crm_fundraising/crm_fundraising_view.xml
+++ b/addons/crm_fundraising/crm_fundraising_view.xml
@@ -165,7 +165,7 @@
                                         string="Reply"
                                         name="%(crm.action_crm_send_mail)d"
                                         context="{'mail':'reply', 'model': 'crm.fundraising', 'include_original' : True}"
-                                        icon="gtk-undo" type="action" />
+                                        icon="terp-mail-replied" type="action" />
                                 </tree>
                                 <form string="Communication history">
                                     <group col="4" colspan="4">
@@ -187,13 +187,13 @@
                                         string="Reply"
                                         name="%(crm.action_crm_send_mail)d"
                                         context="{'mail':'reply', 'model': 'crm.fundraising', 'include_original' : True}"
-                                        icon="gtk-undo" type="action" />
+                                        icon="terp-mail-replied" type="action" />
                                 </form>
                             </field>
                             <button colspan="4" string="Send New Email"
                                 name="%(crm.action_crm_send_mail)d"
                                 context="{'mail':'new', 'model': 'crm.fundraising'}"
-                                icon="gtk-go-forward" type="action" />
+                                icon="terp-mail-message-new" type="action" />
                         </page>
                         <page string="Extra Info" groups="base.group_extended">
                             <group col="2" colspan="2">
diff --git a/addons/crm_helpdesk/crm_helpdesk_view.xml b/addons/crm_helpdesk/crm_helpdesk_view.xml
index b22e59abb7d..f754adfdcc5 100644
--- a/addons/crm_helpdesk/crm_helpdesk_view.xml
+++ b/addons/crm_helpdesk/crm_helpdesk_view.xml
@@ -103,7 +103,7 @@
                                         string="Reply"
                                         name="%(crm.action_crm_send_mail)d"
                                         context="{'mail':'reply', 'model': 'crm.helpdesk', 'include_original' : True}"
-                                        icon="gtk-undo" type="action" />
+                                        icon="terp-mail-replied" type="action" />
                                 </tree>
                                 <form string="Communication history">
                                     <group col="4" colspan="4">
@@ -125,13 +125,13 @@
                                         string="Reply"
                                         name="%(crm.action_crm_send_mail)d"
                                         context="{'mail':'reply', 'model': 'crm.helpdesk', 'include_original' : True}"
-                                        icon="gtk-undo" type="action" />
+                                        icon="terp-mail-replied" type="action" />
                                 </form>
                             </field>
                             <button colspan="4" string="Send New Email"
                                 name="%(crm.action_crm_send_mail)d"
                                 context="{'mail':'new', 'model': 'crm.helpdesk'}"
-                                icon="gtk-go-forward" type="action" />
+                                icon="terp-mail-message-new" type="action" />
                         </page>
                         <page string="Extra Info" groups="base.group_extended">
                             <group colspan="2" col="2">
diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index c625a44fc06..a192234d599 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -376,7 +376,7 @@
                                         string="Reply"
                                         name="%(crm.action_crm_send_mail)d"
                                         context="{'mail':'reply', 'model': 'event.registration', 'include_original' : True}"
-                                        icon="gtk-undo" type="action" />
+                                        icon="terp-mail-replied" type="action" />
                                 </tree>
                                 <form string="Communication history">
                                     <group col="4" colspan="4">
@@ -398,13 +398,13 @@
                                         string="Reply"
                                         name="%(crm.action_crm_send_mail)d"
                                         context="{'mail':'reply', 'model': 'event.registration', 'include_original' : True}"
-                                        icon="gtk-undo" type="action" />
+                                        icon="terp-mail-replied" type="action" />
                                 </form>
                             </field>
                               <button colspan="4" string="Send New Email"
                                 name="%(crm.action_crm_send_mail)d"
                                 context="{'mail':'new', 'model': 'event.registration'}"
-                                icon="gtk-go-forward" type="action" />
+                                icon="terp-mail-message-new" type="action" />
                            </page>
                     </notebook>
                 </form>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 201d6dba07d..ef89b932eb3 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -152,7 +152,7 @@
                                     string="Reply"
                                     name="%(crm.action_crm_send_mail)d"
                                     context="{'mail':'reply', 'model': 'hr.applicant', 'include_original' : True}"
-                                    icon="gtk-undo" type="action" />
+                                    icon="terp-mail-replied" type="action" />
                             </tree>
                             <form string="Communication history">
                                 <group col="4" colspan="4">
@@ -174,13 +174,13 @@
                                     string="Reply"
                                     name="%(crm.action_crm_send_mail)d"
                                     context="{'mail':'reply', 'model': 'hr.applicant', 'include_original' : True}"
-                                    icon="gtk-undo" type="action" />
+                                    icon="terp-mail-replied" type="action" />
                             </form>
                         </field>
                        <button colspan="4" string="Send New Email"
                            name="%(crm.action_crm_send_mail)d"
                            context="{'mail':'new', 'model': 'hr.applicant'}"
-                           icon="gtk-go-forward" type="action" />
+                           icon="terp-mail-message-new" type="action" />
                  </page>
                 </notebook>
             </form>
diff --git a/addons/project_issue/project_issue_view.xml b/addons/project_issue/project_issue_view.xml
index d014181bcb5..766850038c6 100644
--- a/addons/project_issue/project_issue_view.xml
+++ b/addons/project_issue/project_issue_view.xml
@@ -82,7 +82,7 @@
                                         string="Reply"
                                         name="%(crm.action_crm_send_mail)d"
                                         context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True}"
-                                        icon="gtk-undo" type="action" />
+                                        icon="terp-mail-replied" type="action" />
                                 </tree>
                                 <form string="Communication history">
                                     <group col="4" colspan="4">
@@ -104,14 +104,14 @@
                                         string="Reply"
                                         name="%(crm.action_crm_send_mail)d"
                                         context="{'mail':'reply', 'model': 'project.issue', 'include_original' : True}"
-                                        icon="gtk-undo" type="action" />
+                                        icon="terp-mail-replied" type="action" />
                                 </form>
                             </field>
                            <separator colspan="4"/>
                            <button colspan="4" string="Send New Email"
                                name="%(crm.action_crm_send_mail)d"
                                context="{'mail':'new', 'model': 'project.issue'}"
-                               icon="gtk-go-forward" type="action" />
+                               icon="terp-mail-message-new" type="action" />
                         </page>
                            <page string="History" groups="base.group_extended">
                             <group col="2" colspan="2">
diff --git a/addons/sale_crm/wizard/crm_make_sale_view.xml b/addons/sale_crm/wizard/crm_make_sale_view.xml
index b8399eeda90..ac1ef80e011 100644
--- a/addons/sale_crm/wizard/crm_make_sale_view.xml
+++ b/addons/sale_crm/wizard/crm_make_sale_view.xml
@@ -25,10 +25,8 @@
                                                 name="product_id"
                                                 on_change="product_id_change(product_id,product_uom_qty,product_uom,product_uos_qty,product_uos,name,parent.partner_id, 'lang' in context and context['lang'], True, product_packaging, False)"
                                                 />
-                                            <group colspan="2">
                                                <field name="product_uom_qty"/>
-                                               <field name="product_uom" nolabel="1"/>
-                                            </group>
+                                               <field name="product_uom"/>
                                             <group colspan="2" groups="product.group_uos">
                                                <field name="product_uos_qty"/>
                                                <field name="product_uos" nolabel="1"/></group>