diff --git a/rma/views/rma_order_line_view.xml b/rma/views/rma_order_line_view.xml
index ff71a40e0..d72e8aed7 100644
--- a/rma/views/rma_order_line_view.xml
+++ b/rma/views/rma_order_line_view.xml
@@ -100,6 +100,38 @@
                         string="Cancel"
                         attrs="{'invisible':[('state', 'in', ('done', 'canceled'))]}"
                         groups="rma.group_rma_customer_user"
+                    />
+                        <button
+                        name="%(rma.action_rma_picking_in)d"
+                        string="Create Incoming Shipment"
+                        class="oe_highlight"
+                        attrs="{'invisible':['|', '|', '|', ('qty_to_receive', '=', 0), ('qty_to_receive', '&lt;', 0), ('state', '!=', 'approved'), ('receipt_policy', '=', 'no')]}"
+                        type="action"
+                    />
+                        <button
+                        name="%(rma.action_rma_picking_in)d"
+                        string="Create Incoming Shipment"
+                        attrs="{'invisible':['|', '|', ('qty_to_receive', '>', 0), ('state', '!=', 'approved'), ('receipt_policy', '=', 'no')]}"
+                        type="action"
+                    />
+                        <button
+                        name="%(rma.action_rma_picking_out)d"
+                        string="Create Delivery"
+                        class="oe_highlight"
+                        attrs="{'invisible':['|', '|', '|', ('qty_to_deliver', '=', 0), ('qty_to_deliver', '&lt;', 0), ('state', '!=', 'approved'), ('delivery_policy', '=', 'no')]}"
+                        type="action"
+                    />
+                        <button
+                        name="%(rma.action_rma_picking_out)d"
+                        string="Create Delivery"
+                        attrs="{'invisible':['|', '|', ('qty_to_deliver', '>', 0), ('state', '!=', 'approved'), ('delivery_policy', '=', 'no')]}"
+                        type="action"
+                    />
+                        <button
+                        name="%(rma.action_make_supplier_rma)d"
+                        string="Create Supplier RMA"
+                        attrs="{'invisible':['|', ('type', '!=', 'customer'), ('state', '!=', 'approved')]}"
+                        type="action"
                     />
                         <field
                         name="state"
diff --git a/rma/views/rma_order_view.xml b/rma/views/rma_order_view.xml
index b4ee9a32c..f45df2717 100644
--- a/rma/views/rma_order_view.xml
+++ b/rma/views/rma_order_view.xml
@@ -78,6 +78,38 @@
                         attrs="{'invisible':[('state', 'in', ('done', 'cancel'))]}"
                         groups="rma.group_rma_customer_user"
                     />
+                <button
+                        name="%(rma.action_rma_picking_in)d"
+                        string="Create Incoming Shipment"
+                        class="oe_highlight"
+                        attrs="{'invisible':['|', ('qty_to_receive', '=', 0), ('qty_to_receive', '&lt;', 0)]}"
+                        type="action"
+                    />
+                <button
+                        name="%(rma.action_rma_picking_out)d"
+                        string="Create Delivery"
+                        class="oe_highlight"
+                        attrs="{'invisible':['|', ('qty_to_deliver', '=', 0), ('qty_to_deliver', '&lt;', 0)]}"
+                        type="action"
+                    />
+                <button
+                        name="%(rma.action_rma_add_serial_wiz_customer)d"
+                        string="Add Lot/Serial Numbers"
+                        type="action"
+                        attrs="{'invisible':[('type', '!=', 'customer')]}"
+                    />
+                <button
+                        name="%(rma.action_rma_add_stock_move_customer)d"
+                        string="Add From Stock Move"
+                        type="action"
+                        attrs="{'invisible':[('type', '!=', 'customer')]}"
+                    />
+                <button
+                        name="%(rma.action_make_supplier_rma)d"
+                        string="Create Supplier RMA"
+                        attrs="{'invisible':['|', ('type', '!=', 'customer'), ('state', '!=', 'approved')]}"
+                        type="action"
+                    />
                 <field
                         name="state"
                         widget="statusbar"
@@ -290,6 +322,20 @@
         <field name="inherit_id" ref="rma.view_rma_form" />
         <field name="mode">primary</field>
         <field name="arch" type="xml">
+            <xpath expr="//header" position="inside">
+                <button
+                    name="%(rma.action_rma_add_serial_wiz_supplier)d"
+                    string="Add Lot/Serial numbers"
+                    type="action"
+                    attrs="{'invisible':[('type', '!=', 'supplier')]}"
+                />
+                <button
+                    name="%(rma.action_rma_add_stock_move_supplier)d"
+                    string="Add From Stock Move"
+                    type="action"
+                    attrs="{'invisible':[('type', '!=', 'supplier')]}"
+                />
+            </xpath>
             <xpath expr="//button[@name='action_view_lines']" position="attributes">
                 <attribute name="groups">rma.group_rma_supplier_user</attribute>
             </xpath>
diff --git a/rma/wizards/rma_add_serial_views.xml b/rma/wizards/rma_add_serial_views.xml
index 186818ba7..5909d4958 100644
--- a/rma/wizards/rma_add_serial_views.xml
+++ b/rma/wizards/rma_add_serial_views.xml
@@ -44,23 +44,6 @@
         <field name="groups_id" eval="[(4, ref('rma.group_rma_customer_user'))]" />
     </record>
 
-
-    <record id="view_rma_add_serial_wiz_customer_form" model="ir.ui.view">
-        <field name="name">rma.order.form - rma.add.serial.wiz</field>
-        <field name="model">rma.order</field>
-        <field name="inherit_id" ref="rma.view_rma_form" />
-        <field name="arch" type="xml">
-            <xpath expr="//header" position="inside">
-                <button
-                    name="%(action_rma_add_serial_wiz_customer)d"
-                    string="Add Lot/Serial Numbers"
-                    type="action"
-                    attrs="{'invisible':[('type', '!=', 'customer')]}"
-                />
-            </xpath>
-        </field>
-    </record>
-
     <record id="view_rma_add_serial_wiz_supplier" model="ir.ui.view">
         <field name="name">rma.add.serial.wiz.supplier</field>
         <field name="model">rma.add.serial.wiz</field>
@@ -83,20 +66,4 @@
         <field name="groups_id" eval="[(4, ref('rma.group_rma_supplier_user'))]" />
     </record>
 
-    <record id="view_rma_add_serial_wiz_button_supplier_form" model="ir.ui.view">
-        <field name="name">rma.order.supplier.form - rma.add.serial.wiz</field>
-        <field name="model">rma.order</field>
-        <field name="inherit_id" ref="rma.view_rma_supplier_form" />
-        <field name="arch" type="xml">
-            <xpath expr="//header" position="inside">
-                <button
-                    name="%(action_rma_add_serial_wiz_supplier)d"
-                    string="Add Lot/Serial numbers"
-                    type="action"
-                    attrs="{'invisible':[('type', '!=', 'supplier')]}"
-                />
-            </xpath>
-        </field>
-    </record>
-
 </odoo>
diff --git a/rma/wizards/rma_add_stock_move_view.xml b/rma/wizards/rma_add_stock_move_view.xml
index 7c91d080d..d0671a8bf 100644
--- a/rma/wizards/rma_add_stock_move_view.xml
+++ b/rma/wizards/rma_add_stock_move_view.xml
@@ -90,23 +90,6 @@
         <field name="groups_id" eval="[(4, ref('rma.group_rma_customer_user'))]" />
     </record>
 
-
-    <record id="view_rma_add_stock_move_customer_form" model="ir.ui.view">
-        <field name="name">rma.order.form - stock.move wizard</field>
-        <field name="model">rma.order</field>
-        <field name="inherit_id" ref="rma.view_rma_form" />
-        <field name="arch" type="xml">
-            <xpath expr="//header" position="inside">
-                <button
-                    name="%(action_rma_add_stock_move_customer)d"
-                    string="Add From Stock Move"
-                    type="action"
-                    attrs="{'invisible':[('type', '!=', 'customer')]}"
-                />
-            </xpath>
-        </field>
-    </record>
-
     <record id="view_rma_add_stock_move_supplier" model="ir.ui.view">
         <field name="name">rma.add.stock.move.supplier</field>
         <field name="model">rma_add_stock_move</field>
@@ -172,20 +155,4 @@
         <field name="groups_id" eval="[(4, ref('rma.group_rma_supplier_user'))]" />
     </record>
 
-    <record id="view_rma_add_stock_move_button_supplier_form" model="ir.ui.view">
-        <field name="name">rma.order.supplier.form - stock.move wizard</field>
-        <field name="model">rma.order</field>
-        <field name="inherit_id" ref="rma.view_rma_supplier_form" />
-        <field name="arch" type="xml">
-            <xpath expr="//header" position="inside">
-                <button
-                    name="%(action_rma_add_stock_move_supplier)d"
-                    string="Add From Stock Move"
-                    type="action"
-                    attrs="{'invisible':[('type', '!=', 'supplier')]}"
-                />
-            </xpath>
-        </field>
-    </record>
-
 </odoo>
diff --git a/rma/wizards/rma_make_picking_view.xml b/rma/wizards/rma_make_picking_view.xml
index 480aec9d7..92b0209a0 100644
--- a/rma/wizards/rma_make_picking_view.xml
+++ b/rma/wizards/rma_make_picking_view.xml
@@ -98,64 +98,4 @@
         <field name="binding_model_id" ref="rma.model_rma_order_line" />
     </record>
 
-    <record id="view_rma_line_button_form" model="ir.ui.view">
-        <field name="name">rma.order.line.form</field>
-        <field name="model">rma.order.line</field>
-        <field name="inherit_id" ref="rma.view_rma_line_form" />
-        <field name="arch" type="xml">
-            <header position="inside">
-                <button
-                    name="%(action_rma_picking_in)d"
-                    string="Create Incoming Shipment"
-                    class="oe_highlight"
-                    attrs="{'invisible':['|', '|', '|', ('qty_to_receive', '=', 0), ('qty_to_receive', '&lt;', 0), ('state', '!=', 'approved'), ('receipt_policy', '=', 'no')]}"
-                    type="action"
-                />
-                <button
-                    name="%(action_rma_picking_in)d"
-                    string="Create Incoming Shipment"
-                    attrs="{'invisible':['|', '|', ('qty_to_receive', '>', 0), ('state', '!=', 'approved'), ('receipt_policy', '=', 'no')]}"
-                    type="action"
-                />
-                <button
-                    name="%(action_rma_picking_out)d"
-                    string="Create Delivery"
-                    class="oe_highlight"
-                    attrs="{'invisible':['|', '|', '|', ('qty_to_deliver', '=', 0), ('qty_to_deliver', '&lt;', 0), ('state', '!=', 'approved'), ('delivery_policy', '=', 'no')]}"
-                    type="action"
-                />
-                <button
-                    name="%(action_rma_picking_out)d"
-                    string="Create Delivery"
-                    attrs="{'invisible':['|', '|', ('qty_to_deliver', '>', 0), ('state', '!=', 'approved'), ('delivery_policy', '=', 'no')]}"
-                    type="action"
-                />
-            </header>
-        </field>
-    </record>
-
-    <record id="view_rma_button_form" model="ir.ui.view">
-        <field name="name">rma.order.form</field>
-        <field name="model">rma.order</field>
-        <field name="inherit_id" ref="rma.view_rma_form" />
-        <field name="arch" type="xml">
-            <header position="inside">
-                <button
-                    name="%(action_rma_picking_in)d"
-                    string="Create Incoming Shipment"
-                    class="oe_highlight"
-                    attrs="{'invisible':['|', ('qty_to_receive', '=', 0), ('qty_to_receive', '&lt;', 0)]}"
-                    type="action"
-                />
-                <button
-                    name="%(action_rma_picking_out)d"
-                    string="Create Delivery"
-                    class="oe_highlight"
-                    attrs="{'invisible':['|', ('qty_to_deliver', '=', 0), ('qty_to_deliver', '&lt;', 0)]}"
-                    type="action"
-                />
-            </header>
-        </field>
-    </record>
-
 </odoo>
diff --git a/rma/wizards/rma_make_supplier_rma_view.xml b/rma/wizards/rma_make_supplier_rma_view.xml
index 9c88f007f..0ecc534e3 100644
--- a/rma/wizards/rma_make_supplier_rma_view.xml
+++ b/rma/wizards/rma_make_supplier_rma_view.xml
@@ -59,35 +59,4 @@
         <field name="binding_model_id" ref="rma.model_rma_order_line" />
     </record>
 
-    <record id="view_rma_line_supplier_rma_button_form" model="ir.ui.view">
-    <field name="name">rma.order.line.supplier.rma.form</field>
-    <field name="model">rma.order.line</field>
-    <field name="inherit_id" ref="rma.view_rma_line_form" />
-    <field name="arch" type="xml">
-        <header position="inside">
-            <button
-                    name="%(action_make_supplier_rma)d"
-                    string="Create Supplier RMA"
-                    attrs="{'invisible':['|', ('type', '!=', 'customer'), ('state', '!=', 'approved')]}"
-                    type="action"
-                />
-        </header>
-    </field>
-    </record>
-
-    <record id="view_rma_supplier_rma_button_form" model="ir.ui.view">
-    <field name="name">rma.supplier.rma.form</field>
-    <field name="model">rma.order</field>
-    <field name="inherit_id" ref="rma.view_rma_form" />
-    <field name="arch" type="xml">
-        <header position="inside">
-            <button
-                    name="%(action_make_supplier_rma)d"
-                    string="Create Supplier RMA"
-                    attrs="{'invisible':['|', ('type', '!=', 'customer'), ('state', '!=', 'approved')]}"
-                    type="action"
-                />
-        </header>
-    </field>
-    </record>
 </odoo>
diff --git a/rma_account/views/rma_order_line_view.xml b/rma_account/views/rma_order_line_view.xml
index b2198885f..38faab17d 100644
--- a/rma_account/views/rma_order_line_view.xml
+++ b/rma_account/views/rma_order_line_view.xml
@@ -24,6 +24,21 @@
         <field name="model">rma.order.line</field>
         <field name="inherit_id" ref="rma.view_rma_line_form" />
         <field name="arch" type="xml">
+            <xpath expr="//header" position="inside">
+                <button
+                    name="%(rma_account.action_rma_refund)d"
+                    string="Create Refund"
+                    class="oe_highlight"
+                    attrs="{'invisible':['|', '|', '|', ('qty_to_refund', '=', 0),  ('qty_to_refund', '&lt;', 0), ('state', '!=', 'approved'), ('refund_policy', '=', 'no')]}"
+                    type="action"
+                />
+                <button
+                    name="%(rma_account.action_rma_refund)d"
+                    string="Create Refund"
+                    attrs="{'invisible':['|', '|', ('qty_to_refund', '>', 0), ('state', '!=', 'approved'), ('refund_policy', '=', 'no')]}"
+                    type="action"
+                />
+            </xpath>
             <button name="action_view_out_shipments" position="after">
                 <button
                     type="object"
diff --git a/rma_account/views/rma_order_view.xml b/rma_account/views/rma_order_view.xml
index c6090d032..15391a75d 100644
--- a/rma_account/views/rma_order_view.xml
+++ b/rma_account/views/rma_order_view.xml
@@ -5,6 +5,21 @@
         <field name="model">rma.order</field>
         <field name="inherit_id" ref="rma.view_rma_form" />
         <field name="arch" type="xml">
+            <xpath expr="//header" position="inside">
+                <button
+                    name="%(rma_account.action_rma_refund)d"
+                    string="Create Refund"
+                    class="oe_highlight"
+                    attrs="{'invisible':['|', '|', ('qty_to_refund', '=', 0),  ('qty_to_refund', '&lt;', 0), ('state', '!=', 'approved')]}"
+                    type="action"
+                />
+                <button
+                    name="%(rma_account.action_rma_refund)d"
+                    string="Create Refund"
+                    attrs="{'invisible':['|', ('qty_to_refund', '>', 0), ('state', '!=', 'approved')]}"
+                    type="action"
+                />
+            </xpath>
             <button name="action_view_out_shipments" position="after">
                 <button
                     type="object"
diff --git a/rma_account/wizards/rma_refund.xml b/rma_account/wizards/rma_refund.xml
index 7569291c6..4472b3a82 100644
--- a/rma_account/wizards/rma_refund.xml
+++ b/rma_account/wizards/rma_refund.xml
@@ -49,49 +49,4 @@
         <field name="target">new</field>
     </record>
 
-    <record id="view_rma_line_button_refund_form" model="ir.ui.view">
-        <field name="name">rma.order.line.form</field>
-        <field name="model">rma.order.line</field>
-        <field name="inherit_id" ref="rma.view_rma_line_form" />
-        <field name="arch" type="xml">
-            <xpath expr="//header" position="inside">
-                <button
-                    name="%(action_rma_refund)d"
-                    string="Create Refund"
-                    class="oe_highlight"
-                    attrs="{'invisible':['|', '|', '|', ('qty_to_refund', '=', 0),  ('qty_to_refund', '&lt;', 0), ('state', '!=', 'approved'), ('refund_policy', '=', 'no')]}"
-                    type="action"
-                />
-                <button
-                    name="%(action_rma_refund)d"
-                    string="Create Refund"
-                    attrs="{'invisible':['|', '|', ('qty_to_refund', '>', 0), ('state', '!=', 'approved'), ('refund_policy', '=', 'no')]}"
-                    type="action"
-                />
-            </xpath>
-        </field>
-    </record>
-
-    <record id="view_rma_button_refund_form" model="ir.ui.view">
-        <field name="model">rma.order</field>
-        <field name="inherit_id" ref="rma.view_rma_form" />
-        <field name="arch" type="xml">
-            <xpath expr="//header" position="inside">
-                <button
-                    name="%(action_rma_refund)d"
-                    string="Create Refund"
-                    class="oe_highlight"
-                    attrs="{'invisible':['|', '|', ('qty_to_refund', '=', 0),  ('qty_to_refund', '&lt;', 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>
-
 </odoo>
diff --git a/rma_sale/views/rma_order_line_view.xml b/rma_sale/views/rma_order_line_view.xml
index 02e9eeb3e..69c6c89ed 100644
--- a/rma_sale/views/rma_order_line_view.xml
+++ b/rma_sale/views/rma_order_line_view.xml
@@ -68,14 +68,14 @@
         <field name="arch" type="xml">
             <header position="inside">
                 <button
-                    name="%(action_rma_make_sale_order)d"
+                    name="%(rma_sale.action_rma_make_sale_order)d"
                     string="Create Sales Quotation"
                     class="oe_highlight"
                     attrs="{'invisible':['|', '|', '|', ('qty_to_sell', '=', 0), ('qty_to_sell', '&lt;', 0), ('state', '!=', 'approved'), ('sale_policy', '=', 'no')]}"
                     type="action"
                 />
                 <button
-                    name="%(action_rma_make_sale_order)d"
+                    name="%(rma_sale.action_rma_make_sale_order)d"
                     string="Create Sales Quotation"
                     attrs="{'invisible':['|', '|', ('qty_to_sell', '>', 0), ('state', '!=', 'approved'), ('sale_policy', '=', 'no')]}"
                     type="action"
diff --git a/rma_sale/views/rma_order_view.xml b/rma_sale/views/rma_order_view.xml
index 8a54874c6..33278d803 100644
--- a/rma_sale/views/rma_order_view.xml
+++ b/rma_sale/views/rma_order_view.xml
@@ -5,6 +5,14 @@
             <field name="model">rma.order</field>
             <field name="inherit_id" ref="rma.view_rma_form" />
             <field name="arch" type="xml">
+                <xpath expr="//header" position="inside">
+                    <button
+                    name="%(rma_sale.action_rma_add_sale)d"
+                    string="Add From Sale Order"
+                    type="action"
+                    attrs="{'invisible':[('type', '!=', 'customer')]}"
+                />
+                </xpath>
                 <div name="button_box" position="inside">
                     <button
                     type="object"
@@ -33,14 +41,14 @@
         <field name="arch" type="xml">
             <header position="inside">
                 <button
-                    name="%(action_rma_make_sale_order)d"
+                    name="%(rma_sale.action_rma_make_sale_order)d"
                     string="Create Sales Quotation"
                     class="oe_highlight"
                     attrs="{'invisible':['|', '|', ('qty_to_sell', '=', 0), ('qty_to_sell', '&lt;', 0), ('state', '!=', 'approved')]}"
                     type="action"
                 />
                 <button
-                    name="%(action_rma_make_sale_order)d"
+                    name="%(rma_sale.action_rma_make_sale_order)d"
                     string="Create Sales Quotation"
                     attrs="{'invisible':['|', ('qty_to_sell', '>', 0), ('state', '!=', 'approved')]}"
                     type="action"
diff --git a/rma_sale/wizards/rma_add_sale.xml b/rma_sale/wizards/rma_add_sale.xml
index 0e823ec0f..41b99d6cb 100644
--- a/rma_sale/wizards/rma_add_sale.xml
+++ b/rma_sale/wizards/rma_add_sale.xml
@@ -103,21 +103,4 @@
         />
     </record>
 
-
-    <record id="view_rma_add_sale_form" model="ir.ui.view">
-        <field name="name">rma.order.form - sale wizard</field>
-        <field name="model">rma.order</field>
-        <field name="inherit_id" ref="rma.view_rma_form" />
-        <field name="arch" type="xml">
-            <xpath expr="//header" position="inside">
-                <button
-                    name="%(action_rma_add_sale)d"
-                    string="Add From Sale Order"
-                    type="action"
-                    attrs="{'invisible':[('type', '!=', 'customer')]}"
-                />
-            </xpath>
-        </field>
-    </record>
-
 </odoo>