diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 457b2d38c90..3df167d63d2 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -15,7 +15,7 @@
                 </tree>
             </field>
         </record>
-        
+
         <record id="view_delivery_carrier_form" model="ir.ui.view">
             <field name="name">delivery.carrier.form</field>
             <field name="model">delivery.carrier</field>
@@ -90,7 +90,7 @@
                 </form>
             </field>
         </record>
-        
+
         <record id="action_delivery_carrier_form" model="ir.actions.act_window">
             <field name="name">Delivery Method</field>
             <field name="type">ir.actions.act_window</field>
@@ -299,7 +299,7 @@
             <field name="model">stock.picking</field>
             <field name="inherit_id" ref="stock.view_picking_out_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/header/button[@string='Create Invoice']" position="after">
+                <xpath expr="/form/header//button[@string='Create Invoice']" position="after">
                     <button name="%(report_shipping)d" string="Delivery Order" states="done" type="action" icon="gtk-print"/>
                 </xpath>
             </field>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 821a7136375..9568f578b76 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -728,14 +728,15 @@
             <field name="arch" type="xml">
                 <form string="Internal Picking List" version="7.0">
                 <header>
-                    <button name="draft_force_assign" states="draft" string="Confirm" type="object" class="oe_highlight"/>
-                    <button name="draft_validate" states="draft" string="Confirm &amp; Transfer" type="object" class="oe_highlight"/>
-                    <!-- <button name="action_assign" states="confirmed" string="Check Availability" type="object"/> -->
-                    <button name="force_assign" states="confirmed" string="Force Availability" type="object" class="oe_highlight"/>
-                    <button name="action_process" states="assigned" string="Confirm &amp; Transfer" groups="stock.group_stock_user" type="object" class="oe_highlight"/>
-                    <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice"  attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" class="oe_highlight"/>
-                    <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action"/>
-                    <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel"/>
+                    <span groups="base.group_user">
+                        <button name="draft_force_assign" states="draft" string="Confirm" type="object" class="oe_highlight"/>
+                        <button name="draft_validate" states="draft" string="Confirm &amp; Transfer" type="object" class="oe_highlight"/>
+                        <button name="force_assign" states="confirmed" string="Force Availability" type="object" class="oe_highlight"/>
+                        <button name="action_process" states="assigned" string="Confirm &amp; Transfer" groups="stock.group_stock_user" type="object" class="oe_highlight"/>
+                        <button name="%(action_stock_invoice_onshipping)d" string="Create Invoice" attrs="{'invisible': ['|','|',('state','&lt;&gt;','done'),('invoice_state','=','invoiced'),('invoice_state','=','none')]}"  type="action" class="oe_highlight"/>
+                        <button name="%(act_stock_return_picking)d" string="Reverse Transfer" states="done" type="action"/>
+                        <button name="button_cancel" states="assigned,confirmed,draft" string="_Cancel"/>
+                    </span>
                     <field name="state" widget="statusbar" statusbar_visible="draft,assigned,done" statusbar_colors='{"shipping_except":"red","invoice_except":"red","waiting_date":"blue"}'/>
                 </header>
                 <sheet>
@@ -771,7 +772,8 @@
                                     <button name="%(stock.move_scrap)d"
                                         string="Scrap Products" type="action"
                                         icon="gtk-convert" context="{'scrap': True}"
-                                        states="draft,waiting,confirmed,assigned"/>
+                                        states="draft,waiting,confirmed,assigned"
+                                        groups="base.group_user"/>
                                     <field name="scrapped" invisible="1"/>
                                     <field name="prodlot_id" groups="stock.group_production_lot"/>
                                     <button
@@ -965,18 +967,18 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="/form/header/button[@name='%(act_stock_return_picking)d']" position="replace">
+                    <xpath expr="/form/header//button[@name='%(act_stock_return_picking)d']" position="replace">
                         <button name="%(report_picking_list_out)d" string="Print Delivery Slip" type="action" states="done" class="oe_highlight"/>
                         <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action"/>
                     </xpath>
-                    <xpath expr="/form/header/button[@name='draft_validate']" position="replace">
+                    <xpath expr="/form/header//button[@name='draft_validate']" position="replace">
                         <button name="draft_validate" states="draft" string="Confirm &amp; Deliver" type="object" class="oe_highlight"/>
                         <button name="action_assign" states="confirmed" string="Check Availability" type="object" class="oe_highlight"/>
                     </xpath>
-                    <xpath expr="/form/header/button[@name='action_process']" position="replace">
+                    <xpath expr="/form/header//button[@name='action_process']" position="replace">
                         <button name="action_process" states="assigned" string="Deliver" type="object" icon="gtk-go-forward" class="oe_highlight"/>
                     </xpath>
-                    <xpath expr="/form/header/field[@name='state']" position="replace">
+                    <xpath expr="/form/header//field[@name='state']" position="replace">
                         <field name="state" nolabel="1" readonly="1" widget="statusbar" statusbar_visible="draft,confirmed,assigned,done" statusbar_colors='{"auto":"blue", "confirmed":"blue"}'/>
                     </xpath>
                     <xpath expr="//field[@name='partner_id']" position="replace">
@@ -1079,7 +1081,7 @@
             <field name="type">form</field>
             <field name="arch" type="xml">
                 <data>
-                    <xpath expr="//button[@name='%(act_stock_return_picking)d']" position="replace">
+                    <xpath expr="/form/header//button[@name='%(act_stock_return_picking)d']" position="replace">
                         <button name="%(act_stock_return_picking)d" string="Return Products" states="done" type="action"/>
                     </xpath>
                     <xpath expr="//button[@name='draft_validate']" position="replace">
@@ -1206,8 +1208,6 @@
             </field>
         </record>
 
-        <!-- <menuitem id="menu_traceability_low" name="Low Level" parent="menu_traceability"/> -->
-
         <record id="view_move_form" model="ir.ui.view">
             <field name="name">stock.move.form</field>
             <field name="model">stock.move</field>
@@ -1339,13 +1339,10 @@
         </record>
         <menuitem action="action_move_form2" id="menu_action_move_form2" parent="menu_traceability" sequence="3"/>
 
-        ====================================
-        Reception Picking (By Stock Move)
-        ====================================
-            <!--  from stock_partial_move_view -->
-
-
-
+        <!--
+            Reception Picking (By Stock Move)
+            From stock_partial_move_view
+        -->
         <record id="view_move_tree_reception_picking" model="ir.ui.view">
             <field name="name">stock.move.tree2</field>
             <field name="model">stock.move</field>
@@ -1365,7 +1362,7 @@
                     <field name="prodlot_id" groups="stock.group_production_lot"/>
                     <button name="%(track_line)d" string="Split in Serial Numbers" type="action"
                         icon="terp-stock_effects-object-colorize" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
-                       states="draft,waiting,confirmed,assigned,done"
+                        states="draft,waiting,confirmed,assigned,done"
                         groups="stock.group_tracking_lot"/>
                     <field name="tracking_id" groups="stock.group_tracking_lot"/>
                     <button name="setlast_tracking" string="Put in current pack" type="object"