diff --git a/addons/account/views/account_move_views.xml b/addons/account/views/account_move_views.xml
index 503fbbdf346..e8339d8caf0 100644
--- a/addons/account/views/account_move_views.xml
+++ b/addons/account/views/account_move_views.xml
@@ -380,15 +380,15 @@
             <field name="name">account.move.tree</field>
             <field name="model">account.move</field>
             <field name="arch" type="xml">
-                <tree decoration-info="state == 'draft'" string="Journal Entries" decoration-muted="state == 'cancel'">
+                <tree string="Journal Entries">
                     <field name="date"/>
                     <field name="name"/>
                     <field name="partner_id" optional="show"/>
                     <field name="ref" optional="show"/>
                     <field name="journal_id"/>
                     <field name="company_id" groups="base.group_multi_company" optional="show"/>
-                    <field name="amount_total_signed" sum="Total Amount" string="Total"/>
-                    <field name="state"/>
+                    <field name="amount_total_signed" sum="Total Amount" string="Total" decoration-bf="1"/>
+                    <field name="state" widget="badge" decoration-info="state == 'draft'" decoration-success="state == 'posted'"/>
                     <field name="currency_id" invisible="1"/>
                 </tree>
             </field>
@@ -421,8 +421,8 @@
                     <field name="amount_residual_signed" string="Amount Due" sum="Amount Due" optional="hide"/>
                     <field name="currency_id" invisible="1"/>
                     <field name="company_currency_id" invisible="1"/>
-                    <field name="state" optional="hide" decoration-success="state == 'posted'" decoration-info="state == 'draft'" widget="badge"/>
-                    <field name="payment_state" decoration-success="payment_state == 'paid'" decoration-info="payment_state == 'partial' or payment_state == 'not_paid'" decoration-warning="payment_state == 'in_payment'" widget="badge"/>
+                    <field name="state" widget="badge" decoration-success="state == 'posted'" decoration-info="state == 'draft'" optional="show"/>
+                    <field name="payment_state" widget="badge" decoration-warning="payment_state in ('partial', 'in_payment')" decoration-success="payment_state in ('paid', 'reversed')" attrs="{'invisible': [('payment_state', 'in', ('not_paid', 'invoicing_legacy'))]}" nolabel="1"/>
                     <field name="move_type" invisible="context.get('default_move_type', True)"/>
                   </tree>
             </field>