diff --git a/CHANGELOG b/CHANGELOG
index 4622de6a0c..f6350b5f73 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,4 @@
+* Add buttons on stock move form & list
 * Allow to use view location on staging and draft moves
 * Add picking location on warehouse
 * Always compute expected quantity in inventory
diff --git a/move.py b/move.py
index de9d098025..735ab6b08c 100644
--- a/move.py
+++ b/move.py
@@ -287,9 +287,11 @@ class Move(Workflow, ModelSQL, ModelView):
         cls._buttons.update({
                 'cancel': {
                     'invisible': ~Eval('state').in_(['draft', 'assigned']),
+                    'readonly': Eval('shipment'),
                     },
                 'draft': {
                     'invisible': ~Eval('state').in_(['assigned']),
+                    'readonly': Eval('shipment'),
                     },
                 'assign': {
                     'invisible': ~Eval('state').in_(['assigned']),
diff --git a/view/move_form.xml b/view/move_form.xml
index fe311d8fde..cf583ee3eb 100644
--- a/view/move_form.xml
+++ b/view/move_form.xml
@@ -27,6 +27,10 @@ this repository contains the full copyright notices and license terms. -->
     <separator colspan="4" id="separator"/>
     <label name="state"/>
     <field name="state"/>
+    <group col="2" colspan="2" id="buttons">
+        <button name="cancel" string="Cancel" icon="tryton-cancel"/>
+        <button name="draft" string="Reset to Draft" icon="tryton-clear"/>
+    </group>
     <field name="unit_price_required" invisible="1" colspan="4"/>
     <field name="unit_digits" invisible="1" colspan="4"/>
 </form>
diff --git a/view/move_tree.xml b/view/move_tree.xml
index 7211c03677..e5c778d693 100644
--- a/view/move_tree.xml
+++ b/view/move_tree.xml
@@ -2,6 +2,7 @@
 <!-- This file is part of Tryton.  The COPYRIGHT file at the top level of
 this repository contains the full copyright notices and license terms. -->
 <tree string="Moves">
+    <field name="shipment"/>
     <field name="product"/>
     <field name="from_location"/>
     <field name="to_location"/>
@@ -10,5 +11,7 @@ this repository contains the full copyright notices and license terms. -->
     <field name="planned_date"/>
     <field name="effective_date"/>
     <field name="state"/>
+    <button name="cancel" string="Cancel" icon="tryton-cancel"/>
+    <button name="draft" string="Reset to Draft" icon="tryton-clear"/>
     <field name="unit_digits" tree_invisible="1"/>
 </tree>