diff --git a/account.py b/account.py
index fe4eac897c..09a43f3ed7 100644
--- a/account.py
+++ b/account.py
@@ -64,12 +64,15 @@ class MoveLine:
         cls._buttons.update({
                 'pay': {
                     'invisible': ~Eval('payment_kind').in_(dict(KINDS).keys()),
+                    'depends': ['payment_kind'],
                     },
                 'payment_block': {
                     'invisible': Eval('payment_blocked', False),
+                    'depends': ['payment_blocked'],
                     },
                 'payment_unblock': {
                     'invisible': ~Eval('payment_blocked', False),
+                    'depends': ['payment_blocked'],
                     },
                 })
         cls._check_modify_exclude.update(
diff --git a/payment.py b/payment.py
index 23252e7bfa..abb4942619 100644
--- a/payment.py
+++ b/payment.py
@@ -201,20 +201,24 @@ class Payment(Workflow, ModelSQL, ModelView):
                 'draft': {
                     'invisible': Eval('state') != 'approved',
                     'icon': 'tryton-go-previous',
+                    'depends': ['state'],
                     },
                 'approve': {
                     'invisible': Eval('state') != 'draft',
                     'icon': 'tryton-go-next',
+                    'depends': ['state'],
                     },
                 'succeed': {
                     'invisible': ~Eval('state').in_(
                         ['processing', 'failed']),
                     'icon': 'tryton-ok',
+                    'depends': ['state'],
                     },
                 'fail': {
                     'invisible': ~Eval('state').in_(
                         ['processing', 'succeeded']),
                     'icon': 'tryton-cancel',
+                    'depends': ['state'],
                     },
                 })