diff --git a/addons/account_asset/account_asset_view.xml b/addons/account_asset/account_asset_view.xml
index 40d99afd1fe..f9f0e75fba6 100644
--- a/addons/account_asset/account_asset_view.xml
+++ b/addons/account_asset/account_asset_view.xml
@@ -84,7 +84,7 @@
                 </header>
                 <sheet>
                     <div class="oe_button_box oe_right">
-                        <button class="oe_inline oe_stat_button" name="open_entries"  type="object" icon="fa-pencil-square-o">
+                        <button class="oe_inline oe_stat_button" name="open_entries"  type="object" icon="fa-pencil">
                         <field string="Entries" name="entry_count" widget="statinfo" />
                     </button>
                     </div>
diff --git a/addons/account_followup/account_followup_customers.xml b/addons/account_followup/account_followup_customers.xml
index d503ed4b306..bdd258237c8 100644
--- a/addons/account_followup/account_followup_customers.xml
+++ b/addons/account_followup/account_followup_customers.xml
@@ -78,18 +78,18 @@
             <field name="model">res.partner</field>
             <field name="groups_id" eval="[(4, ref('account.group_account_invoice'))]"/>
             <field name="arch" type="xml" >
+                <xpath expr="//div[@name='buttons']" position="inside" groups="account.group_account_invoice">
+                    <button class="oe_inline oe_stat_button" type="object" name="do_button_print" 
+                        icon="fa-print" string="Print Overdue" widget="statinfo" groups="account.group_account_user" 
+                        help="Print overdue payments report independent of follow-up line" 
+                        attrs="{'invisible':[('payment_amount_due', '&lt;=', 0.0)]}"/>
+                    <button class="oe_inline oe_stat_button" type="object" name="do_partner_mail" 
+                        icon="fa-envelope-o" string="Mail Overdue" widget="statinfo" 
+                        help="If not specified by the latest follow-up level, it will send from the default email template"
+                        attrs="{'invisible':[('payment_amount_due', '&lt;=', 0.0)]}" groups="account.group_account_user"/>
+                </xpath>
                 <page string="Accounting" position="before" version="7.0">
                     <page string="Payment Follow-up" groups="account.group_account_invoice" name="followup_tab">
-                        <div class="oe_right oe_button_box" name="followup_button">
-                            <button class="oe_inline oe_stat_button" type="object" name="do_button_print" 
-                                icon="fa-mail" string="Print Overdue Payments" widget="statinfo" groups="account.group_account_user" 
-                                help="Print overdue payments report independent of follow-up line" 
-                                attrs="{'invisible':[('payment_amount_due', '&lt;=', 0.0)]}"/>
-                            <button class="oe_inline oe_stat_button" type="object" name="do_partner_mail" 
-                                icon="fa-print" string="Send Overdue Email" widget="statinfo" 
-                                help="If not specified by the latest follow-up level, it will send from the default email template"
-                                attrs="{'invisible':[('payment_amount_due', '&lt;=', 0.0)]}" groups="account.group_account_user"/>
-                        </div>
                         <p attrs="{'invisible':[('latest_followup_date','=', False)]}">
                             The <field name="latest_followup_date"  class = "oe_inline"/>, the latest payment follow-up
                             was: <field name="latest_followup_level_id" class="oe_inline"/>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 4de42a53669..d62a7969754 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -69,14 +69,14 @@
                     <field name="state" widget="statusbar" statusbar_visible="draft,open"/>
                 </header>
                 <sheet string="Payment order">
-                    <div class="oe_button_box">
-                        <button class="oe_inline oe_stat_button oe_right" name="%(action_create_payment_order)d" string="Select Invoices to Pay"
-                               type="action" attrs="{'invisible':[('state','=','done')]}" icon="fa-search" widget="statinfo"/>
-                    </div>
                     <div class="oe_title">
                         <label for="reference" class="oe_edit_only"/>
                         <h1><field name="reference"/></h1>
                     </div>
+                    <div class=" oe_right oe_button_box">
+                        <button class="oe_inline oe_stat_button oe_right" name="%(action_create_payment_order)d" string="Invoices" Help="Select Invoices to Pay"
+                               type="action" attrs="{'invisible':[('state','=','done')]}" icon="fa-pencil-square-o" widget="statinfo"/>
+                    </div>
                     <group>
                         <group>
                             <field name="user_id" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'account.group_account_invoice']}"/>
@@ -292,7 +292,7 @@
             <field name="inherit_id" ref="account.view_bank_statement_form"/>
             <field name="arch" type="xml">
 	            <xpath expr="//div[@name='import_buttons']" position="inside">
-	                <button class="oe_inline oe_stat_button" name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import Payment Lines" type="action" icon="fa-cogs" widget="statinfo"/>
+	                <button class="oe_inline oe_stat_button" name="%(action_account_populate_statement_confirm)d" attrs="{'invisible':[('state','=','confirm')]}" string="Import Lines" help="Import Payment Lines" type="action" icon="fa-cogs" widget="statinfo"/>
 	            </xpath>
             </field>
         </record>
diff --git a/addons/account_voucher/account_voucher_view.xml b/addons/account_voucher/account_voucher_view.xml
index aae4d5dbed4..bbc17580f94 100644
--- a/addons/account_voucher/account_voucher_view.xml
+++ b/addons/account_voucher/account_voucher_view.xml
@@ -201,7 +201,7 @@
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='import_buttons']" position="inside">
                     <button class="oe_inline oe_stat_button" name="%(action_view_account_statement_from_invoice_lines)d"
-                            string="Import Invoices" type="action"
+                            string="Import Invoice" type="action"
                             attrs="{'invisible':[('state','=','confirm')]}" widget="statinfo" icon="fa-pencil-square-o"/>
                 </xpath>
             </field>
diff --git a/addons/crm/crm_lead_view.xml b/addons/crm/crm_lead_view.xml
index 17c7f58c4fe..beed7ba5c97 100644
--- a/addons/crm/crm_lead_view.xml
+++ b/addons/crm/crm_lead_view.xml
@@ -104,7 +104,7 @@
                 <sheet>
                     <div class="oe_right oe_button_box" name="buttons">
                         <button class="oe_inline oe_stat_button" type="action" name="%(opportunity2phonecall_act)d" icon="fa-phone"  
-                            widget="statinfo" string="Schedule/Log Call"/>
+                            widget="statinfo" string="Calls"/>
                     </div>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>
@@ -389,11 +389,11 @@
                     <sheet>
                         <div class="oe_right oe_button_box">
                             <button class="oe_inline oe_stat_button" type="action" name="%(opportunity2phonecall_act)d" icon="fa-phone"  
-                                widget="statinfo" string="Schedule/Log Call"/>
+                                widget="statinfo" string="Calls"/>
                             <button class="oe_inline oe_stat_button" type="object" 
                                 context="{'search_default_attendee_id': active_id, 'default_attendee_id' : active_id}"
                                 name="action_makeMeeting" icon="fa-calendar">
-                                <field string="Meeting" name="meeting_count" widget="statinfo"/>
+                                <field string="Meetings" name="meeting_count" widget="statinfo"/>
                             </button>
                         </div>
                         <div class="oe_title">
diff --git a/addons/crm/crm_phonecall_view.xml b/addons/crm/crm_phonecall_view.xml
index e41040905b2..25cddce10b6 100644
--- a/addons/crm/crm_phonecall_view.xml
+++ b/addons/crm/crm_phonecall_view.xml
@@ -66,12 +66,13 @@
                 <sheet string="Phone Call">
                     <div class="oe_right oe_button_box">
                         <button class="oe_inline oe_stat_button" type="object" name="action_button_convert2opportunity" 
-                            icon="fa fa-star fa-fw" string="Convert to Opportunity" 
-                            attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state', 'not in', ('open', 'done'))]}" widget="statinfo"/>
+                            icon="fa-star" string="Opportunity" 
+                            attrs="{'invisible':[ '|', ('opportunity_id','!=',False), ('state', 'not in', ('open', 'done'))]}"
+                            help="Convert to Opportunity" widget="statinfo"/>
                         <button class="oe_inline oe_stat_button" type="action" 
-                            name="%(phonecall_to_phonecall_act)d" icon="fa-phone fa-fw" string="Schedule Other Call" widget="statinfo"/>
+                            name="%(phonecall_to_phonecall_act)d" icon="fa-phone" string="Other Call" widget="statinfo"/>
                         <button class="oe_inline oe_stat_button" name="action_make_meeting" type="object" icon="fa-calendar fa-fw">
-                              <field string="Schedule a Meeting" name="meeting_count" widget="statinfo" />
+                              <field string="Plan Meeting" name="meeting_count" widget="statinfo" />
                         </button>
                     </div>
                     <div class="oe_title">
diff --git a/addons/crm_project_issue/project_issue_view.xml b/addons/crm_project_issue/project_issue_view.xml
index bd147378e28..65ca274f086 100644
--- a/addons/crm_project_issue/project_issue_view.xml
+++ b/addons/crm_project_issue/project_issue_view.xml
@@ -37,7 +37,7 @@
         <field name="arch" type="xml">
             <xpath expr="//div[@name='buttons']/button" position="after">
                     <button class="oe_inline oe_stat_button" type="action" name="%(convert_lead2projectissue_wizard_action)d" icon="fa-bug"  
-                        help="Convert to Issue" widget="statinfo" string="Convert to Issue"/>
+                        help="Convert to Issue" widget="statinfo" string="Move to Issue"/>
             </xpath>
         </field>
     </record>
diff --git a/addons/email_template/email_template_view.xml b/addons/email_template/email_template_view.xml
index 26fa93f520a..52fb270eb12 100644
--- a/addons/email_template/email_template_view.xml
+++ b/addons/email_template/email_template_view.xml
@@ -14,10 +14,10 @@
                         </div>
                         <div class="oe_right oe_button_box" name="buttons">
                             <field name="ref_ir_act_window" invisible="1"/>
-                            <button class="oe_inline oe_stat_button" name="create_action" string="Add context action" type="object"
-                                    attrs="{'invisible':[('ref_ir_act_window','!=',False)]}" icon="fa-adn"
+                            <button class="oe_inline oe_stat_button" name="create_action" string="Add action" type="object"
+                                    attrs="{'invisible':[('ref_ir_act_window','!=',False)]}" icon="fa-plus"
                                     help="Display an option on related documents to open a composition wizard with this template" widget="statinfo"/>
-                            <button name="unlink_action" string="Remove context action" type="object" 
+                            <button name="unlink_action" string="Drop action" type="object" 
                                     class="oe_stat_button" icon="fa-minus"
                                     attrs="{'invisible':[('ref_ir_act_window','=',False)]}"
                                     help="Remove the contextual action to use this template on related documents" widget="statinfo"/>
diff --git a/addons/fleet/fleet_view.xml b/addons/fleet/fleet_view.xml
index 4cadeebdc19..e4cdbe886f7 100644
--- a/addons/fleet/fleet_view.xml
+++ b/addons/fleet/fleet_view.xml
@@ -214,7 +214,7 @@
                             <button name="return_action_to_open" 
                                 type="object"
                                 class="oe_stat_button"
-                                icon="fa-thumbs-o-up" 
+                                icon="fa-book" 
                                 context="{'xml_id':'fleet_vehicle_log_contract_act'}" 
                                 help="show the contract for this vehicle">
                                 <field name="contract_count" widget="statinfo" string="Contracts"/>
@@ -222,7 +222,7 @@
                             <button name="act_show_log_cost" 
                                 type="object"
                                 class="oe_stat_button"
-                                icon="fa-money" 
+                                icon="fa-usd" 
                                 help="show all the costs for this vehicle" 
                                 groups="fleet.group_fleet_manager">
                                 <field name="cost_count" widget="statinfo" string="Costs"/>
@@ -241,7 +241,7 @@
                                 icon="fa-flask" 
                                 context="{'xml_id':'fleet_vehicle_log_fuel_act'}" 
                                 help="show the fuel logs for this vehicle" >
-                                <field name="fuel_logs_count" widget="statinfo" string="Fuel Logs"/>
+                                <field name="fuel_logs_count" widget="statinfo" string="Fuel"/>
                             </button>
                             <button name="return_action_to_open" 
                                 type="object" 
@@ -249,7 +249,7 @@
                                 icon="fa-tachometer"
                                 context="{'xml_id':'fleet_vehicle_odometer_act'}" 
                                 help="show the odometer logs for this vehicle" >
-                                <field name="odometer_count" widget="statinfo" string="odometer Logs"/>
+                                <field name="odometer_count" widget="statinfo" string="Odometer"/>
                             </button>
                         </div> 
                         <group col="2" string="General Properties">
diff --git a/addons/gamification/views/challenge.xml b/addons/gamification/views/challenge.xml
index ef2151c5a77..9683557a14c 100644
--- a/addons/gamification/views/challenge.xml
+++ b/addons/gamification/views/challenge.xml
@@ -56,9 +56,9 @@
                             <button type="action" 
                                 name="%(goals_from_challenge_act)d" 
                                 class="oe_stat_button"
-                                icon="fa-globe"
+                                icon="fa-gift"
                                 attrs="{'invisible': [('state','=','draft')]}">
-                                <field name="goals_count" widget="statinfo" string="Related Goals"/>
+                                <field name="goals_count" widget="statinfo" string="Goals" help="Related Goals"/>
                             </button>
                         </div>
                         <group>
diff --git a/addons/hr_contract/hr_contract_view.xml b/addons/hr_contract/hr_contract_view.xml
index eb1adaad9fc..f97aefd70ed 100644
--- a/addons/hr_contract/hr_contract_view.xml
+++ b/addons/hr_contract/hr_contract_view.xml
@@ -23,7 +23,7 @@
                     <xpath expr="//div[@name='button_box']" position="inside">
                         <button name="%(act_hr_employee_2_hr_contract)d" 
                             class="oe_stat_button" 
-                            icon="fa-thumbs-o-up" 
+                            icon="fa-book" 
                             type="action"
                             groups="base.group_hr_manager">
                             <field name="contracts_count" widget="statinfo" string="Contracts"/>
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 42e48771701..4d153fa7e31 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -147,7 +147,7 @@
             <xpath expr="//div[@name='button_box']" position="inside">
                 <button name="%(act_hr_employee_2_hr__evaluation_interview)d"  
                     class="oe_stat_button"
-                    icon="fa-briefcase"
+                    icon="fa-sitemap"
                     type="action">
                     <field name="appraisal_count" widget="statinfo" string="Appraisal Interviews"/>
                 </button>
diff --git a/addons/hr_payroll/hr_payroll_view.xml b/addons/hr_payroll/hr_payroll_view.xml
index 6232f593b90..4cf7597d87e 100644
--- a/addons/hr_payroll/hr_payroll_view.xml
+++ b/addons/hr_payroll/hr_payroll_view.xml
@@ -224,9 +224,9 @@
                     <div class="oe_right oe_button_box">
                         <button name="%(act_payslip_lines)d" 
                             class="oe_stat_button" 
-                            icon="fa-comment" 
+                            icon="fa-money" 
                             type="action">
-                            <field name="payslip_count" widget="statinfo" string="Payslip Computation Details"/>
+                            <field name="payslip_count" widget="statinfo" string="Payslip" help="Payslip Computation Details"/>
                         </button>
                     </div>
                     <div class="oe_title">
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 4bf705d9de2..6221d0d83f1 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -75,23 +75,23 @@
             <sheet>
                 <div class="oe_right oe_button_box">
                     <button name="action_makeMeeting" class="oe_stat_button" icon="fa-calendar" type="object"
-                         string="Schedule Meeting" help="Schedule interview with this applicant"/>
+                         string="Meeting" help="Schedule interview with this applicant"/>
                     <button name="%(survey.action_view_survey_question_message)d" 
                         class="oe_stat_button"
-                        icon="fa-pencil-square-o" 
+                        icon="fa-user" 
                         type="action"
-                        string="Start Interview" help="Answer related job question"
+                        string="Interview" help="Answer related job question"
                         context="{'survey_id': survey, 'response_id': [response], 'response_no':0 ,'active' : response, 'object' : 'hr.applicant'}"
                         attrs="{'invisible':[('survey','=',False)]}"/>
                     <button name="action_print_survey" 
                         class="oe_stat_button"
-                        icon="fa-pencil-square-o"
+                        icon="fa-print"
                         type="object"
-                        string="Print Interview" help="Print interview report"
+                        string="Print" help="Print interview report"
                         attrs="{'invisible':[('survey','=',False)]}"/>
                     <button name="action_get_attachment_tree_view" 
                         class="oe_stat_button"
-                        icon="fa-pencil-square-o"
+                        icon="fa-book"
                         type="object">
                         <field name="attachment_number" widget="statinfo" string="Documents"/>
                     </button>
diff --git a/addons/hr_timesheet/hr_timesheet_view.xml b/addons/hr_timesheet/hr_timesheet_view.xml
index 0546099e581..a9de1bb19c9 100644
--- a/addons/hr_timesheet/hr_timesheet_view.xml
+++ b/addons/hr_timesheet/hr_timesheet_view.xml
@@ -119,7 +119,7 @@
                 </xpath>
                 <xpath expr='//div[@name="buttons"]' position='inside'>
                     <button class="oe_inline oe_stat_button" type="action" name="%(act_analytic_cost_revenue)d" 
-                        icon="fa-suitcase"  string="Costs and Revenues" widget="statinfo"/>
+                        icon="fa-usd"  string="Cost/Revenue" widget="statinfo"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
index d6c987b6a24..a60afda8531 100644
--- a/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
+++ b/addons/hr_timesheet_sheet/hr_timesheet_sheet_view.xml
@@ -74,8 +74,8 @@
                         <button type="action"
                             name="%(act_hr_timesheet_sheet_sheet_2_hr_analytic_timesheet)d"
                             class="oe_stat_button"
-                            icon="fa-times">
-                            <field name="timesheet_activity_count" widget="statinfo" string="Timesheet Activities"/>
+                            icon="fa-clock-o">
+                            <field name="timesheet_activity_count" widget="statinfo" string="Timesheet" help="Timesheet Activities"/>
                         </button>
                         <button type="action" groups="base.group_hr_attendance"
                             class="oe_stat_button" icon="fa-users"
diff --git a/addons/marketing_campaign/marketing_campaign_view.xml b/addons/marketing_campaign/marketing_campaign_view.xml
index c5789dd68ba..20c3a1bb6e7 100644
--- a/addons/marketing_campaign/marketing_campaign_view.xml
+++ b/addons/marketing_campaign/marketing_campaign_view.xml
@@ -66,7 +66,7 @@
                         name="%(act_marketing_campaing_stat)d"
                         class="oe_stat_button"
                         icon="fa-keyboard-o"
-                        string="Campaign Statistics"/>
+                        string="Statistics" help="Marketing Campaign Statistics"/>
                     <button type="action"
                         name="%(act_marketing_campaing_segment_opened)d"
                         class="oe_stat_button"
diff --git a/addons/point_of_sale/point_of_sale_view.xml b/addons/point_of_sale/point_of_sale_view.xml
index c58d2eafd9e..1d1bd73703f 100644
--- a/addons/point_of_sale/point_of_sale_view.xml
+++ b/addons/point_of_sale/point_of_sale_view.xml
@@ -843,10 +843,10 @@
                     </header>
                     <sheet>
                         <div class="oe_right oe_button_box">
-                            <button class="oe_stat_button" name="%(action_pos_box_in)d" string="Put Money In" 
-                                type="action" states="opened,closing_control" icon="fa-money"/>
-                            <button class="oe_stat_button" name="%(action_pos_box_out)d" string="Take Money Out" 
-                                type="action" states="opened,closing_control" icon="fa-money"/>
+                            <button class="oe_stat_button" name="%(action_pos_box_in)d" string="Put Money" 
+                                type="action" states="opened,closing_control" icon="fa-level-down"/>
+                            <button class="oe_stat_button" name="%(action_pos_box_out)d" string="Take Money" 
+                                type="action" states="opened,closing_control" icon="fa-level-up"/>
                         </div>
                         <h1 class="oe_title">
                             Session:
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 9e4b11c20a1..4af0a7aed0a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -154,7 +154,7 @@
                 <sheet>
                     <div class="oe_button_box oe_right">
                     <button class=" oe_inline oe_stat_button " name= "%(project_phase_task_list)d" type="action" icon="fa-tasks">
-                        <field string="Related Tasks" name="tasks_count" widget="statinfo"/>
+                        <field string="Tasks" name="tasks_count" widget="statinfo"/>
                     </button>
                     </div>
                     <div class="oe_title">
diff --git a/addons/purchase/partner_view.xml b/addons/purchase/partner_view.xml
index 77fe49aeef6..9ff2645a51c 100644
--- a/addons/purchase/partner_view.xml
+++ b/addons/purchase/partner_view.xml
@@ -77,7 +77,7 @@
                     <button class="oe_inline oe_stat_button" name="%(purchase.act_res_partner_2_purchase_order)d" type="action"
                         attrs="{'invisible': [('supplier', '=', False)]}"
                         groups="purchase.group_purchase_user" icon="fa-list-alt">
-                        <field string="Purchase Orders" name="purchase_order_count" widget="statinfo"/>
+                        <field string="Purchase Order" name="purchase_order_count" widget="statinfo"/>
                     </button>
                     <button class="oe_inline oe_stat_button" name="%(purchase.act_res_partner_2_supplier_invoices)d" type="action"
                         attrs="{'invisible': [('supplier', '=', False)]}" icon="fa-pencil-square-o">
diff --git a/addons/purchase/stock_view.xml b/addons/purchase/stock_view.xml
index 94eaff5f498..33972c90fb6 100644
--- a/addons/purchase/stock_view.xml
+++ b/addons/purchase/stock_view.xml
@@ -50,11 +50,11 @@
                             class="oe_stat_button"
                             icon="fa-truck"
                             states="approved">
-                            <field name="shipment_count" widget="statinfo" string="Incoming Shipments"/>
+                            <field name="shipment_count" widget="statinfo" string="In Shipments" help="Incoming Shipments"/>
                         </button>
                         <button type="object"  name="invoice_open"
                             class="oe_stat_button"
-                            icon="fa-file-o"
+                            icon="fa-pencil-square-o"
                             attrs="{'invisible': [('state', 'in', ['draft','sent'])]}">
                             <field name="invoice_count" widget="statinfo" string="Invoices"/>
                         </button> 
diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index 049d2e40284..e689cac1476 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -51,7 +51,7 @@
                     <button class="oe_inline oe_stat_button" type="action" name="%(sale.act_res_partner_2_sale_order)d" 
                         attrs="{'invisible': [('customer', '=', False)]}"
                         icon="fa-strikethrough" groups="base.group_sale_salesman">
-                        <field string="Quot. and Sales" name="sale_order_count" widget="statinfo"/>
+                        <field string="Sales" name="sale_order_count" widget="statinfo"/>
                     </button>     
                 </xpath>
             </field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 9e712ce5d97..b9518cc03c3 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -239,15 +239,17 @@
                             <field name="date"/>
                             <field name="active"/>
                         </group>
-                        <group groups="stock.group_tracking_lot" string="Traceability">
-                            <div class="oe_button_box">
+                        <group  class="oe_right" groups="stock.group_tracking_lot" string="Traceability">
+                            <div class="oe_right oe_button_box">
                                 <button name="action_traceability" 
-                                    string="Upstream Traceability"
+                                    string="Upstream"
+                                    help="Upstream Traceability"
                                     class="oe_stat_button"
                                     icon="fa-arrow-up" 
                                     type="object" colspan="2"/>
                                 <button name="action_traceability" 
-                                    string="Downstream Traceability"
+                                    string="Downstream"
+                                    help="Downstream Traceability"
                                     class="oe_stat_button"
                                     icon="fa-arrow-down" 
                                     type="object"
@@ -353,10 +355,16 @@
             <field name="arch" type="xml">
                 <form string="Serial Number" version="7.0">
                     <div class="oe_button_box oe_right">
-                        <button name="action_traceability" string="Upstream Traceability" class="oe_stat_button"
-                            icon="fa-arrow-up" type="object" context="{'type': 'move_history_ids2', 'field': 'prodlot_id'}"/>
-                        <button name="action_traceability" string="Downstream Traceability" class="oe_stat_button"
-                            icon="fa-arrow-down" type="object" context="{'type': 'move_history_ids', 'field': 'prodlot_id'}"/>
+                        <button name="action_traceability" 
+                            string="Upstream" class="oe_stat_button" 
+                            help="Upstream Traceability"
+                            icon="fa-arrow-up" type="object" 
+                            context="{'type': 'move_history_ids2', 'field': 'prodlot_id'}"/>
+                        <button name="action_traceability" 
+                            string="Downstream" class="oe_stat_button"
+                            icon="fa-arrow-down" type="object" 
+                            help="Downstream Traceability"
+                            context="{'type': 'move_history_ids', 'field': 'prodlot_id'}"/>
                     </div>
                     <div class="oe_title">
                         <label for="name" class="oe_edit_only"/>