diff --git a/rma/views/rma_order_line_view.xml b/rma/views/rma_order_line_view.xml
index 86aac3cc..74e2305e 100644
--- a/rma/views/rma_order_line_view.xml
+++ b/rma/views/rma_order_line_view.xml
@@ -330,6 +330,7 @@
                                 name="action_view_in_shipments"
                                 class="oe_stat_button"
                                 icon="fa-truck"
+                                attrs="{'invisible': [('in_shipment_count', '=', 0)]}"
                                 groups="stock.group_stock_user"
                             >
                                 <field
@@ -343,6 +344,7 @@
                                 name="action_view_out_shipments"
                                 class="oe_stat_button"
                                 icon="fa-truck"
+                                attrs="{'invisible': [('out_shipment_count', '=', 0)]}"
                                 groups="stock.group_stock_user"
                             >
                                 <field
@@ -363,6 +365,7 @@
                                 class="oe_stat_button"
                                 icon="fa-link"
                                 groups="stock.group_stock_user"
+                                attrs="{'invisible': [('rma_line_count', '=', 0)]}"
                             >
                                 <field
                                     name="rma_line_count"
diff --git a/rma_account/views/rma_order_line_view.xml b/rma_account/views/rma_order_line_view.xml
index c6671dcf..67499453 100644
--- a/rma_account/views/rma_order_line_view.xml
+++ b/rma_account/views/rma_order_line_view.xml
@@ -68,6 +68,7 @@
                     name="action_view_invoice"
                     class="oe_stat_button"
                     icon="fa-pencil-square-o"
+                    attrs="{'invisible': [('account_move_line_id', '=', False)]}"
                     string="Origin Inv"
                 >
                 </button>
@@ -76,7 +77,8 @@
                     name="action_view_refunds"
                     class="oe_stat_button"
                     icon="fa-pencil-square-o"
-                    groups="account.group_account_user"
+                    attrs="{'invisible': [('refund_count', '=', 0)]}"
+                    groups="account.group_account_invoice"
                 >
                         <field name="refund_count" widget="statinfo" string="Refunds" />
                     </button>
diff --git a/rma_sale/models/rma_order_line.py b/rma_sale/models/rma_order_line.py
index caf332d7..654d1176 100644
--- a/rma_sale/models/rma_order_line.py
+++ b/rma_sale/models/rma_order_line.py
@@ -204,6 +204,13 @@ class RmaOrderLine(models.Model):
         result["domain"] = [("id", "in", order_ids)]
         return result
 
+    def action_view_origin_sale_order(self):
+        action = self.env.ref("sale.action_orders_salesteams")
+        result = action.sudo().read()[0]
+        order_ids = self.sale_id.ids
+        result["domain"] = [("id", "in", order_ids)]
+        return result
+
     def _get_rma_sold_qty(self):
         self.ensure_one()
         qty = 0.0
diff --git a/rma_sale/views/rma_order_line_view.xml b/rma_sale/views/rma_order_line_view.xml
index 013011a1..1c48b924 100644
--- a/rma_sale/views/rma_order_line_view.xml
+++ b/rma_sale/views/rma_order_line_view.xml
@@ -7,11 +7,21 @@
             <field name="inherit_id" ref="rma.view_rma_line_form" />
             <field name="arch" type="xml">
                 <div name='button_box' position="inside">
+                <button
+                    type="object"
+                    name="action_view_origin_sale_order"
+                    class="oe_stat_button"
+                    icon="fa-strikethrough"
+                    attrs="{'invisible': [('sale_id', '=', False)]}"
+                    string="Origin Sale Order"
+                >
+                </button>
                     <button
                     type="object"
                     name="action_view_sale_order"
                     class="oe_stat_button"
                     icon="fa-strikethrough"
+                    attrs="{'invisible': [('sales_count', '=', 0)]}"
                     groups="sales_team.group_sale_salesman_all_leads"
                 >
                             <field
@@ -22,6 +32,7 @@
                     </button>
                 </div>
                 <group name="main_info" position="inside">
+                    <field name="sale_id" invisible="1" />
                     <field
                     name="sale_line_id"
                     context="{'rma': True}"
@@ -37,12 +48,6 @@
                 <field name="delivery_policy" position="after">
                     <field name="sale_policy" />
                 </field>
-                <field name="origin" position="after">
-                    <field
-                    name="sale_id"
-                    attrs="{'invisible': [('sale_line_id', '=', False)]}"
-                />
-                </field>
                 <notebook position="inside">
                     <page name="sale" string="Sale Lines">
                         <field name="sale_line_ids" nolabel="1" />