diff --git a/addons/delivery/views/product_template_view.xml b/addons/delivery/views/product_template_view.xml
index d5b1506f5a9..62c556ad20c 100644
--- a/addons/delivery/views/product_template_view.xml
+++ b/addons/delivery/views/product_template_view.xml
@@ -7,14 +7,8 @@
     <field name="inherit_id" ref="product.product_template_form_view"/>
     <field name="arch" type="xml">
 	       <xpath expr="//group[@name='group_lots_and_weight']" position="inside">
-               <label for="hs_code"/>
-               <div class="o_row" name="hs_code">
-                   <field name="hs_code" string="HS Code"/><div/>
-               </div>
-               <label for="country_of_origin"/>
-               <div class="o_row" name="country_of_origin">
-                   <field name="country_of_origin"/><div/>
-               </div>
+                <field name="hs_code" string="HS Code"/>
+                <field name="country_of_origin"/>
            </xpath>
     </field>
 </record>
diff --git a/addons/product/views/product_views.xml b/addons/product/views/product_views.xml
index f84caa9736b..8c60b3ebb77 100644
--- a/addons/product/views/product_views.xml
+++ b/addons/product/views/product_views.xml
@@ -120,12 +120,12 @@
                                 <group name="group_lots_and_weight" string="Logistics" attrs="{'invisible': [('type', 'not in', ['product', 'consu'])]}">
                                     <label for="weight" attrs="{'invisible':[('product_variant_count', '>', 1), ('is_product_variant', '=', False)]}"/>
                                     <div class="o_row" name="weight" attrs="{'invisible':[('product_variant_count', '>', 1), ('is_product_variant', '=', False)]}">
-                                        <field name="weight"/>
+                                        <field name="weight" class="oe_inline"/>
                                         <field name="weight_uom_name"/>
                                     </div>
                                     <label for="volume" attrs="{'invisible':[('product_variant_count', '>', 1), ('is_product_variant', '=', False)]}"/>
                                     <div class="o_row" name="volume" attrs="{'invisible':[('product_variant_count', '>', 1), ('is_product_variant', '=', False)]}">
-                                        <field name="volume" string="Volume"/>
+                                        <field name="volume" string="Volume" class="oe_inline"/>
                                         <field name="volume_uom_name"/>
                                     </div>
                                 </group>