diff --git a/account_commission/views/commission_settlement_views.xml b/account_commission/views/commission_settlement_views.xml
index 772b25a9e..f9d039b0a 100644
--- a/account_commission/views/commission_settlement_views.xml
+++ b/account_commission/views/commission_settlement_views.xml
@@ -18,6 +18,13 @@
         <field name="model">commission.settlement</field>
         <field name="inherit_id" ref="commission.view_settlement_form" />
         <field name="arch" type="xml">
+            <button name="action_cancel" position="attributes">
+                <attribute
+                    name="groups"
+                    add="account.group_account_invoice,account_commission.group_invoicing_commission"
+                    separator=","
+                />
+            </button>
             <button name="action_cancel" position="before">
                 <button
                     string="Make invoice"
@@ -25,21 +32,21 @@
                     class="oe_highlight"
                     type="object"
                     name="action_invoice"
-                    groups="account.group_account_invoice"
+                    groups="account.group_account_invoice,account_commission.group_invoicing_commission"
                 />
                 <button
                     string="Reset to draft"
                     attrs="{'invisible': [('state', '!=', 'except_invoice')]}"
                     type="object"
                     name="action_draft"
-                    groups="account.group_account_invoice"
+                    groups="account.group_account_invoice,account_commission.group_invoicing_commission"
                 />
             </button>
             <field name="settlement_type" position="after">
                 <field
                     name="invoice_id"
                     attrs="{'invisible': [('state', '!=', 'invoiced')]}"
-                    groups="account.group_account_invoice"
+                    groups="account.group_account_invoice,account_commission.group_invoicing_commission"
                 />
             </field>
             <xpath
@@ -49,7 +56,7 @@
                 <field
                     name="invoice_line_id"
                     attrs="{'column_invisible': [('parent.settlement_type', '!=', 'sale_invoice')]}"
-                    groups="account.group_account_invoice"
+                    groups="account.group_account_invoice,account_commission.group_invoicing_commission"
                 />
             </xpath>
         </field>
diff --git a/commission/views/commission_settlement_views.xml b/commission/views/commission_settlement_views.xml
index 9fc79ecaf..e5d7c543d 100644
--- a/commission/views/commission_settlement_views.xml
+++ b/commission/views/commission_settlement_views.xml
@@ -62,6 +62,7 @@
                         states="settled"
                         type="object"
                         name="action_cancel"
+                        groups="commission.group_commission_manager"
                     />
                     <field name="state" widget="statusbar" />
                 </header>
diff --git a/sale_commission/security/ir.model.access.csv b/sale_commission/security/ir.model.access.csv
index 11b923fb4..83823092e 100644
--- a/sale_commission/security/ir.model.access.csv
+++ b/sale_commission/security/ir.model.access.csv
@@ -1,5 +1,6 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_sale_order_line_agent,access_sale_order_line_agent,model_sale_order_line_agent,sales_team.group_sale_salesman,1,1,1,1
+access_sale_order_line_agent_salesman,access_sale_order_line_agent_salesman,model_sale_order_line_agent,sales_team.group_sale_salesman,1,0,0,0
+access_sale_order_line_agent_commission_user,access_sale_order_line_agent_commission_user,model_sale_order_line_agent,commission.group_commission_user,1,1,1,1
 access_commission,access_commission,commission.model_commission,sales_team.group_sale_salesman,1,0,0,0
 access_commission_section_user,access_commission_section_user,commission.model_commission_section,sales_team.group_sale_salesman,1,0,0,0
 access_account_invoice_line_agent,access_account_invoice_line_agent,account_commission.model_account_invoice_line_agent,sales_team.group_sale_salesman,1,0,0,0
diff --git a/sale_commission/views/sale_order_view.xml b/sale_commission/views/sale_order_view.xml
index 02c645419..a0cf3f0b3 100644
--- a/sale_commission/views/sale_order_view.xml
+++ b/sale_commission/views/sale_order_view.xml
@@ -28,19 +28,28 @@
                 />
             </field>
             <xpath expr="//field[@name='note']" position="after">
-                <group name="group_recompute_commission">
-                    <button
-                        name="recompute_lines_agents"
-                        type="object"
-                        string="Regenerate agents"
-                        states="draft,sent"
-                    />
-                    <button
-                        name="recompute_lines_agents_amount"
-                        type="object"
-                        string="Recompute amounts"
-                        states="draft,sent"
-                    />
+                <group
+                    name="group_recompute_commission"
+                    attrs="{'invisible': [('state', 'not in', ['draft', 'sent'])]}"
+                    colspan="2"
+                    groups="commission.group_commission_user"
+                    string="Commission actions"
+                >
+                    <div class="o_row" colspan="2">
+                        <button
+                            name="recompute_lines_agents"
+                            type="object"
+                            string="Regenerate agents"
+                            class="btn-secondary me-3"
+                            groups="commission.group_commission_manager"
+                        />
+                        <button
+                            name="recompute_lines_agents_amount"
+                            type="object"
+                            string="Recompute amounts"
+                            class="btn-secondary"
+                        />
+                    </div>
                 </group>
             </xpath>
         </field>