diff --git a/TODO b/TODO
index 1b49e7103f..4d083fb95f 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,3 @@
-- use a wizard for assignation on customer packing and internal packing,
-    to display error message if not all lines were assigned (issue540).
-- handle withdraw packing
+- Use a wizard for assignation on customer packing and internal packing,
+  to display error message if not all lines were assigned (issue540).
+- Handle withdraw packing.
diff --git a/inventory.xml b/inventory.xml
index 65600a6f7c..f9396268ef 100644
--- a/inventory.xml
+++ b/inventory.xml
@@ -6,6 +6,7 @@
             <field name="name">Complete Inventory</field>
             <field name="wiz_name">stock.inventory.complete</field>
             <field name="model">stock.inventory</field>
+            <field name="groups" eval="[('add', ref('group_stock'))]"/>
         </record>
 
         <record model="ir.ui.view" id="inventory_view_form">
diff --git a/packing.xml b/packing.xml
index 934948d15d..e391e29dbe 100644
--- a/packing.xml
+++ b/packing.xml
@@ -196,7 +196,7 @@ this repository contains the full copyright notices and license terms. -->
                                         icon="tryton-cancel"/>
                                 <button string="Draft" name="draft"
                                         states="{'invisible': '''state != 'waiting' ''', 'readonly': '''%(group_stock)d not in groups'''}"
-                                        icon="tryton-clear"/>
+                                        icon="tryton-go-previous"/>
                                 <button string="Waiting" name="waiting"
                                         states="{'invisible': '''state not in ('assigned', 'draft')''', 'readonly': '''%(group_stock)d not in groups''', 'icon': '''state == 'assigned' and 'tryton-go-previous' or state == 'draft' and 'tryton-go-next' or False'''}"/>
                                 <button string="Force Assign" name="force_assign"
@@ -354,7 +354,7 @@ this repository contains the full copyright notices and license terms. -->
                                 icon="tryton-cancel"/>
                             <button string="Draft" name="draft"
                                 states="{'invisible': '''state != 'waiting' ''', 'readonly': '''%(group_stock)d not in groups'''}"
-                                icon="tryton-clear"/>
+                                icon="tryton-go-previous"/>
                             <button string="Waiting" name="waiting"
                                 states="{'invisible': '''state not in ('assigned', 'draft')''', 'readonly': '''%(group_stock)d not in groups''', 'icon': '''state == 'assigned' and 'tryton-go-previous' or state == 'draft' and 'tryton-go-next' or False'''}"/>
                             <button string="Force Assign" name="force_assign"