diff --git a/addons/delivery/delivery_view.xml b/addons/delivery/delivery_view.xml
index 52cd58d571e..6959aacbbdb 100644
--- a/addons/delivery/delivery_view.xml
+++ b/addons/delivery/delivery_view.xml
@@ -234,10 +234,6 @@
                     <field name="weight"/>
                     <field name="weight_net" groups="base.group_no_one"/>
                </field>
-               <xpath expr="/form/sheet/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
-                    <field name="weight"/>
-                    <field name="weight_net" groups="base.group_no_one"/>
-               </xpath>
             </field>
         </record>
 
@@ -319,10 +315,11 @@
         <record id="view_delivery_order_inherit_stock" model="ir.ui.view">
             <field name="name">stock.picking.out.form</field>
             <field name="model">stock.picking.out</field>
-            <field name="inherit_id" ref="stock.view_picking_out_form"/>
+            <field name="inherit_id" ref="stock.view_picking_form"/>
             <field name="arch" type="xml">
-                <xpath expr="/form/header//button[@string='Create Invoice/Refund']" position="after">
-                    <button name="%(report_shipping)d" string="Delivery Order" states="done" type="action" icon="gtk-print"/>
+                <xpath expr="/form/header//button[@name='action_process']" position="after">
+                    <button name="%(report_shipping)d" string="Print Delivery Order" states="confirmed,assigned" type="action"/>
+                    <button name="%(report_shipping)d" string="Print Delivery Order" states="done" type="action" class="oe_highlight"/>
                 </xpath>
             </field>
         </record>
@@ -337,10 +334,6 @@
                     <field name="weight"/>
                     <field name="weight_net" groups="base.group_no_one"/>
                </field>
-               <xpath expr="/form/sheet/notebook/page/field[@name='move_lines']/tree/field[@name='product_uom']" position="after">
-                    <field name="weight"/>
-                    <field name="weight_net" groups="base.group_no_one"/>
-               </xpath>
             </field>
         </record>
     </data>