diff --git a/rma/views/res_config_settings_views.xml b/rma/views/res_config_settings_views.xml
index 82982e2f5..1a319cab1 100644
--- a/rma/views/res_config_settings_views.xml
+++ b/rma/views/res_config_settings_views.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <odoo>
 
     <record id="res_config_settings_view_form" model="ir.ui.view">
@@ -8,56 +8,21 @@
         <field name="inherit_id" ref="base.res_config_settings_view_form" />
         <field name="arch" type="xml">
             <xpath expr="//form" position="inside">
-                <div
-                    class="app_settings_block"
-                    data-string="RMA"
-                    string="RMA"
-                    data-key="rma"
-                    groups="rma.group_rma_manager"
-                >
-                    <h2>Return Merchandise Authorization</h2>
-                    <div class="row mt16 o_settings_container">
-                        <div
-                            name="rma_delivery_address"
-                            class="col-12 col-lg-6 o_setting_box"
-                        >
-                            <div class="o_setting_left_pane">
-                                <field name="group_rma_delivery_address" />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="group_rma_delivery_address" />
-                                <div class="text-muted">
-                                    Display 3 fields on rma: partner, invoice address, delivery address
-                                </div>
-                            </div>
-                        </div>
-                        <div
-                            name="group_rma_lines"
-                            class="col-12 col-lg-6 o_setting_box"
-                        >
-                            <div class="o_setting_left_pane">
-                                <field name="group_rma_lines" />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="group_rma_lines" />
-                                <div class="text-muted">
-                                    Group RMA lines in one RMA group
-                                </div>
-                            </div>
-                        </div>
-                        <div name="rma_account" class="col-12 col-lg-6 o_setting_box">
-                            <div class="o_setting_left_pane">
-                                <field name="module_rma_account" />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="module_rma_account" />
-                                <div class="text-muted">
-                                    Enable RMA invoicing
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
+                <app string="RMA" data-string="RMA" name="rma" groups="rma.group_rma_manager">
+                    <block title="Return Merchandise Authorization"
+                        name="return_merchandise_authorization">
+                        <setting id="rma_delivery_address"
+                            help="Display 3 fields on rma: partner, invoice address, delivery address">
+                            <field name="group_rma_delivery_address" />
+                        </setting>
+                        <setting id="group_rma_lines" help="Group RMA lines in one RMA group">
+                            <field name="group_rma_lines" />
+                        </setting>
+                        <setting id="module_rma_account" help="Enable RMA invoicing">
+                            <field name="module_rma_account" />
+                        </setting>
+                    </block>
+                </app>
             </xpath>
         </field>
     </record>
@@ -71,4 +36,4 @@
         <field name="context">{'module' : 'rma'}</field>
     </record>
 
-</odoo>
+</odoo>
\ No newline at end of file