diff --git a/invoice.py b/invoice.py
index b2d97f2c92..d972463e72 100644
--- a/invoice.py
+++ b/invoice.py
@@ -290,8 +290,8 @@ class Invoice(Workflow, ModelSQL, ModelView, TaxableMixin):
                     'invisible': (~Eval('state').in_(['cancel', 'validated'])
                         | ((Eval('state') == 'cancel')
                             & Eval('cancel_move', -1))),
-                    'icon': If(Eval('state') == 'cancel', 'tryton-clear',
-                        'tryton-go-previous'),
+                    'icon': If(Eval('state') == 'cancel', 'tryton-undo',
+                        'tryton-back'),
                     'depends': ['state'],
                     },
                 'validate_invoice': {
diff --git a/view/invoice_form.xml b/view/invoice_form.xml
index 88c88441bc..c09220efc6 100644
--- a/view/invoice_form.xml
+++ b/view/invoice_form.xml
@@ -48,10 +48,10 @@ this repository contains the full copyright notices and license terms. -->
                     </group>
                     <group col="-1" colspan="4" id="buttons">
                         <button name="cancel" icon="tryton-cancel"/>
-                        <button name="draft" icon="tryton-go-previous"/>
-                        <button name="validate_invoice" icon="tryton-go-next"/>
+                        <button name="draft" icon="tryton-back"/>
+                        <button name="validate_invoice" icon="tryton-forward"/>
                         <button name="post" icon="tryton-ok"/>
-                        <button name="pay" icon="tryton-go-next"/>
+                        <button name="pay" icon="tryton-forward"/>
                     </group>
                 </group>
             </group>