diff --git a/rma_account/views/rma_order_line_view.xml b/rma_account/views/rma_order_line_view.xml
index 20bc2aef..a0235fa9 100644
--- a/rma_account/views/rma_order_line_view.xml
+++ b/rma_account/views/rma_order_line_view.xml
@@ -5,25 +5,6 @@
         <field name="model">rma.order.line</field>
         <field name="inherit_id" ref="rma.view_rma_line_supplier_form" />
         <field name="arch" type="xml">
-            <button name="action_view_out_shipments" position="after">
-                <button
-                    type="object"
-                    name="action_view_invoice"
-                    class="oe_stat_button"
-                    icon="fa-pencil-square-o"
-                    string="Origin Inv"
-                >
-                </button>
-                <button
-                    type="object"
-                    name="action_view_refunds"
-                    class="oe_stat_button"
-                    icon="fa-pencil-square-o"
-                    groups="account.group_account_user"
-                >
-                        <field name="refund_count" widget="statinfo" string="Refunds" />
-                    </button>
-            </button>
             <group name="main_info" position="inside">
                 <field
                     name="account_move_line_id"
@@ -32,28 +13,9 @@
                     domain="[('move_id.move_type', 'not in', ['entry','out_invoice','out_refund']), '|',
                                 ('move_id.partner_id', '=', partner_id),
                                 ('move_id.partner_id', 'child_of', partner_id)]"
+                    attrs="{'invisible':[('type', '!=', 'supplier')]}"
                 />
             </group>
-            <field name="operation_id" position="after">
-                <field name="refund_policy" />
-            </field>
-            <page name="stock" position="after">
-                <page name="refunds" string="Refunds">
-                    <field name="refund_line_ids" nolabel="1" />
-                </page>
-            </page>
-            <field name="delivery_address_id" position="after">
-                <field
-                    name="invoice_address_id"
-                    groups='rma.group_rma_delivery_invoice_address'
-                />
-            </field>
-            <group name="deliver" position="after">
-                <group name="refund">
-                    <field name="qty_to_refund" />
-                    <field name="qty_refunded" />
-                </group>
-            </group>
         </field>
     </record>
 
@@ -89,6 +51,7 @@
                     domain="[('move_id.move_type', '!=', 'entry'), '|',
                                 ('move_id.partner_id', '=', partner_id),
                                 ('move_id.partner_id', 'child_of', partner_id)]"
+                    attrs="{'invisible':[('type', '!=', 'customer')]}"
                 />
             </group>
             <field name="operation_id" position="after">
diff --git a/rma_account/wizards/rma_refund.xml b/rma_account/wizards/rma_refund.xml
index 64b76089..1168bf1c 100644
--- a/rma_account/wizards/rma_refund.xml
+++ b/rma_account/wizards/rma_refund.xml
@@ -57,29 +57,19 @@
             <xpath expr="//header" position="inside">
                 <button
                     name="%(action_rma_refund)d"
-                    states="approved"
                     string="Create Refund"
                     class="oe_highlight"
+                    attrs="{'invisible':['|', ('qty_to_refund', '=', 0), ('state', '!=', 'approved')]}"
+                    type="action"
+                />
+                <button
+                    name="%(action_rma_refund)d"
+                    string="Create Refund"
+                    attrs="{'invisible':['|', ('qty_to_refund', '!=', 0), ('state', '!=', 'approved')]}"
                     type="action"
                 />
             </xpath>
         </field>
     </record>
 
-    <record id="view_rma_line_supplier_button_refund_form" model="ir.ui.view">
-        <field name="name">rma.order.line.supplier.form</field>
-        <field name="model">rma.order.line</field>
-        <field name="inherit_id" ref="rma.view_rma_line_supplier_button_form" />
-        <field name="arch" type="xml">
-            <xpath expr="//header" position="inside">
-                <button
-                    name="%(action_rma_refund)d"
-                    states="approved"
-                    string="Create Refund"
-                    class="oe_highlight"
-                    type="action"
-                />
-            </xpath>
-        </field>
-    </record>
 </odoo>