diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index a33678e6a32..26bc294e436 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -117,7 +117,7 @@
                                         <field name="state"/>
                                         <field name="product_manager"/>
                                     </group>
-                                    <group name="Weights" groups="product.group_stock_packaging" string="Weights">
+                                    <group name="Weights" string="Weights">
                                         <field digits="(14, 3)" name="volume" attrs="{'readonly':[('type','=','service')]}"/>
                                         <field name="weight" attrs="{'readonly':[('type','=','service')]}"/>
                                         <field name="weight_net" attrs="{'readonly':[('type','=','service')]}"/>
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 805752101a6..77adebb7280 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -96,10 +96,10 @@
                             <field name="outgoing_qty" class="oe_inline"/>
                             <field name="virtual_available" class="oe_inline"/>
                     </group>
-                    <group name="lot" groups="stock.group_tracking_lot,stock.group_production_lot" string="Lots">
-                        <field name="track_production" groups="stock.group_production_lot"/>
-                        <field name="track_incoming" groups="stock.group_tracking_lot"/>
-                        <field name="track_outgoing" groups="stock.group_tracking_lot"/>
+                    <group name="lot" groups="stock.group_production_lot" string="Lots">
+                        <field name="track_production"/>
+                        <field name="track_incoming"/>
+                        <field name="track_outgoing"/>
                     </group>
                 </group>
                 <group name="status" position="after" version="7.0">
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index 7c065df0b26..6a58107d7fe 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -227,13 +227,13 @@
             <field name="arch" type="xml">
                 <form string="Packs" version="7.0">
                     <group>
-                        <group groups="product.group_stock_packaging" string="Pack Identification">
+                        <group string="Pack Identification">
                             <field name="name"/>
                             <field name="serial"/>
                             <field name="date"/>
                             <field name="active"/>
                         </group>
-                        <group groups="stock.group_tracking_lot" string="Traceability">
+                        <group string="Traceability">
                             <button name="action_traceability" string="Upstream Traceability" type="object"
                                  colspan="2"/>
                             <button name="action_traceability" string="Downstream Traceability" type="object"
@@ -274,7 +274,7 @@
         <menuitem id="menu_traceability" name="Traceability" parent="menu_stock_root" 
             sequence="3"/>
         <menuitem action="action_tracking_form" id="menu_action_tracking_form"
-            groups="product.group_stock_packaging"
+            groups="stock.group_tracking_lot"
             sequence="6"
             parent="menu_traceability"/>
 
@@ -1139,14 +1139,14 @@
                     <button name="%(track_line)d" string="Split in Serial Numbers" type="action"
                         icon="gtk-justify-fill" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
                         states="draft,waiting,confirmed,assigned,done"
-                        groups="stock.group_tracking_lot"/>
+                        groups="stock.group_production_lot"/>
                     <field name="tracking_id" groups="stock.group_tracking_lot"/>
                     <button name="setlast_tracking" string="Put in current pack" type="object"
-                        groups="product.group_stock_packaging"
+                        groups="stock.group_tracking_lot"
                         icon="terp-accessories-archiver" attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
                         states="draft,assigned,confirmed,done"/>
                     <button name="%(split_into)d" string="Put in a new pack" type="action"
-                        groups="product.group_stock_packaging"
+                        groups="stock.group_tracking_lot"
                         icon="terp-accessories-archiver+"
                         states="draft,assigned,confirmed,done"/>
                     <field name="location_id" groups="stock.group_locations"/>
@@ -1194,7 +1194,7 @@
                         groups="stock.group_tracking_lot"
                         states="draft,assigned,confirmed"/>
                      <button name="%(split_into)d" string="Put in a new pack" type="action"
-                        groups="product.group_stock_packaging"
+                        groups="stock.group_tracking_lot"
                         icon="terp-accessories-archiver+"
                         states="draft,assigned,confirmed"/>
                       <field name="location_dest_id" groups="stock.group_locations"/>
@@ -1262,7 +1262,6 @@
                             <div groups="stock.group_tracking_lot">
                                 <field name="tracking_id" class="oe_inline"/>
                                 <button name="%(split_into)d" string="New Pack" type="action"
-                                      groups="product.group_stock_packaging"
                                       icon="terp-accessories-archiver+"
                                       states="draft,assigned,confirmed"/>
                             </div>
@@ -1329,13 +1328,12 @@
                                 <field name="location_dest_id" domain="[('usage','in', ['internal', 'supplier', 'customer'])]" groups="stock.group_locations"/>
                             </group>
 
-                            <group groups="stock.group_tracking_lot" string="Traceability">
+                            <group groups="stock.group_tracking_lot,stock.group_production_lot" string="Traceability">
                                 <label for="tracking_id"/>
                                 <div>
                                     <field name="tracking_id" groups="stock.group_tracking_lot" class="oe_inline"/>
                                       <button name="%(split_into)d" 
                                             string="New Pack" type="action"
-                                            groups="product.group_stock_packaging"
                                             icon="terp-accessories-archiver+"
                                             states="draft,assigned,confirmed"/>
                                  </div>
@@ -1347,7 +1345,7 @@
                                             domain="[('product_id','=?',product_id)]"
                                             on_change="onchange_lot_id(prodlot_id,product_qty, location_id, product_id, product_uom)" class="oe_inline"/>
                                         <button name="%(track_line)d"
-                                            groups="stock.group_tracking_lot"
+                                            groups="stock.group_production_lot"
                                             states="draft,waiting,confirmed,assigned"
                                             string="Split" type="action" icon="gtk-justify-fill"/>
                             </div>
@@ -1454,15 +1452,15 @@
                     <button name="%(track_line)d" string="Split in Serial Numbers" type="action"
                         icon="gtk-justify-fill" attrs="{'invisible': [('prodlot_id','&lt;&gt;',False)]}"
                         states="draft,waiting,confirmed,assigned,done"
-                        groups="stock.group_tracking_lot"/>
+                        groups="stock.group_production_lot"/>
                     <field name="tracking_id" groups="stock.group_tracking_lot"/>
                     <button name="setlast_tracking" string="Put in current pack" type="object"
                         attrs="{'invisible': [('tracking_id','&lt;&gt;',False)]}"
-                        groups="product.group_stock_packaging"
+                        groups="stock.group_tracking_lot"
                         icon="terp-accessories-archiver"
                         states="draft,assigned,confirmed,done"/>
                     <button name="%(split_into)d" string="Put in a new pack" type="action"
-                        groups="product.group_stock_packaging"
+                        groups="stock.group_tracking_lot"
                         icon="terp-accessories-archiver+"
                         states="draft,assigned,confirmed,done"/>
                     <field name="state"/>
diff --git a/addons/stock/wizard/stock_change_product_qty_view.xml b/addons/stock/wizard/stock_change_product_qty_view.xml
index 807a0a15df5..3204a3b7f48 100644
--- a/addons/stock/wizard/stock_change_product_qty_view.xml
+++ b/addons/stock/wizard/stock_change_product_qty_view.xml
@@ -10,7 +10,7 @@
                         <field name="new_quantity" />
                         <field name="product_id" invisible="1"/>
                         <field name="location_id" groups="stock.group_locations"/>
-                        <field name="prodlot_id"  context="{'search_default_product_id':product_id,'default_product_id':product_id}" groups="stock.group_tracking_lot"/>
+                        <field name="prodlot_id"  context="{'search_default_product_id':product_id,'default_product_id':product_id}" groups="stock.group_production_lot"/>
                     </group>
                     <footer>
                         <button name="change_product_qty" string="_Apply" type="object" class="oe_highlight"/>