diff --git a/addons/delivery/__manifest__.py b/addons/delivery/__manifest__.py
index 25a131c413e..3b23a43c95e 100644
--- a/addons/delivery/__manifest__.py
+++ b/addons/delivery/__manifest__.py
@@ -29,6 +29,8 @@ invoices from picking, the system is able to add and compute the shipping line.
         'wizard/choose_delivery_package_views.xml',
         'wizard/choose_delivery_carrier_views.xml',
         'views/stock_package_type_views.xml',
+        'views/stock_picking_type_views.xml',
+        'views/stock_rule_views.xml',
     ],
     'demo': ['data/delivery_demo.xml'],
     'installable': True,
diff --git a/addons/delivery/views/stock_picking_type_views.xml b/addons/delivery/views/stock_picking_type_views.xml
new file mode 100644
index 00000000000..d28aa94fb51
--- /dev/null
+++ b/addons/delivery/views/stock_picking_type_views.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record model="ir.ui.view" id="view_picking_type_form_delivery">
+        <field name="name">stock.picking.type.tree.delivery</field>
+        <field name="model">stock.picking.type</field>
+        <field name="inherit_id" ref="stock.view_picking_type_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='sequence_code']" position="after">
+                <field name="print_label" attrs="{'invisible': [('code', '!=', 'internal')]}"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/addons/delivery/views/stock_rule_views.xml b/addons/delivery/views/stock_rule_views.xml
new file mode 100644
index 00000000000..e43623c148b
--- /dev/null
+++ b/addons/delivery/views/stock_rule_views.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="view_stock_rule_form_delivery" model="ir.ui.view">
+        <field name="name">stock.rule.tree.delivery</field>
+        <field name="model">stock.rule</field>
+        <field name="inherit_id" ref="stock.view_stock_rule_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='propagate_cancel']" position="after">
+                <field name="propagate_carrier" groups="base.group_no_one"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/addons/stock/views/stock_picking_views.xml b/addons/stock/views/stock_picking_views.xml
index 0f3ab6a330f..1ecf9557fe6 100644
--- a/addons/stock/views/stock_picking_views.xml
+++ b/addons/stock/views/stock_picking_views.xml
@@ -43,7 +43,6 @@
                                 <field name="sequence_id" groups="base.group_no_one"/>
                                 <field name="sequence_code"/>
                                 <field name="warehouse_id" groups="stock.group_stock_multi_warehouses" force_save="1"/>
-                                <field name="print_label" attrs="{'invisible': [('code', '!=', 'internal')]}"/>
                                 <field name="reservation_method" attrs="{'invisible': [('code', '=', 'incoming')]}" widget="radio"/>
                                 <field name="auto_show_reception_report" attrs="{'invisible': [('code', 'not in', ['incoming', 'internal'])]}" groups="stock.group_reception_report"/>
                                 <label for="reservation_days_before" string="Reserve before scheduled date" attrs="{'invisible': ['|', ('code', '=', 'incoming'), ('reservation_method', '!=', 'by_date')]}"/>
diff --git a/addons/stock/views/stock_rule_views.xml b/addons/stock/views/stock_rule_views.xml
index 4699256d072..0c52ef8daed 100644
--- a/addons/stock/views/stock_rule_views.xml
+++ b/addons/stock/views/stock_rule_views.xml
@@ -98,7 +98,6 @@
                                 <field name="group_propagation_option"/>
                                 <field name="group_id" attrs="{'invisible': [('group_propagation_option', '!=', 'fixed')], 'required': [('group_propagation_option', '=', 'fixed')]}"/>
                                 <field name="propagate_cancel"/>
-                                <field name="propagate_carrier" groups="base.group_no_one"/>
                                 <field name="propagate_warehouse_id"/>
                             </group>
                             <group string="Options" attrs="{'invisible': [('action', 'not in', ['pull', 'push', 'pull_push'])]}">