diff --git a/rma/views/res_config_settings_views.xml b/rma/views/res_config_settings_views.xml
index a887024d..e8254bef 100644
--- a/rma/views/res_config_settings_views.xml
+++ b/rma/views/res_config_settings_views.xml
@@ -2,89 +2,184 @@
 <odoo>
     <record id="res_config_settings_view_form" model="ir.ui.view">
         <field name="model">res.config.settings</field>
-        <field name="inherit_id" ref="stock.res_config_settings_view_form" />
+        <field name="inherit_id" ref="base.res_config_settings_view_form" />
         <field name="arch" type="xml">
-            <xpath
-                expr="//block[@name='operations_setting_container']"
-                position="inside"
-            >
-                <setting
-                    title="Finish RMAs manually"
-                    help=" When the RMA is receive, allow to finsish it manually choosing a finalization reason."
-                >
-                        <field name="group_rma_manual_finalization" />
-                </setting>
-                <setting
-                    title="Values set here are company-specific."
-                    help="Group RMA returns by customer and warehouse."
-                >
-                        <field name="rma_return_grouping" />
-                </setting>
-                <setting
-                    title="Send automatic RMA info to customer"
-                    help="When the RMA is confirmed, send an automatic information email."
-                >
-                        <field name="send_rma_confirmation" />
-                        <div class="row mt16" invisible="not send_rma_confirmation">
-                            <label
-                            for="rma_mail_confirmation_template_id"
-                            string="Email Template"
-                            class="col-lg-4 o_light_label"
-                        />
-                            <field
-                            name="rma_mail_confirmation_template_id"
-                            class="oe_inline"
-                            required="send_rma_confirmation"
-                            context="{'default_model': 'rma'}"
-                        />
-                        </div>
-                </setting>
-                <setting
-                    title="Send automatic RMA products reception notification to customer"
-                    help="When the RMA products are received, send an automatic information email."
-                >
-                        <field name="send_rma_receipt_confirmation" />
-                        <div
-                        class="row mt16"
-                        invisible="not send_rma_receipt_confirmation"
+            <xpath expr="//form" position="inside">
+                <app string="RMA" groups="rma.rma_group_manager" name="rma">
+                    <h2>Return Merchandise Authorization Management</h2>
+                    <div
+                        class="row mt16 o_settings_container"
+                        name="operations_setting_container"
                     >
-                        <label
-                            for="rma_mail_receipt_confirmation_template_id"
-                            string="Email Template"
-                            class="col-lg-4 o_light_label"
-                        />
-
-                        <field
-                            name="rma_mail_receipt_confirmation_template_id"
-                            class="oe_inline"
-                            required="send_rma_receipt_confirmation"
-                            context="{'default_model': 'rma'}"
-                        />
-                        </div>
-                </setting>
-                <setting
-                    title="Send automatic notification when the customer places an RMA"
-                    help="When customers themselves place an RMA from the portal, send an automatic notification acknowleging it."
-                >
-                        <field name="send_rma_draft_confirmation" />
                         <div
-                        class="row mt16"
-                        invisible="not send_rma_draft_confirmation"
-                    >
-                            <label
-                            for="rma_mail_draft_confirmation_template_id"
-                            string="Email Template"
-                            class="col-lg-4 o_light_label"
-                        />
-                            <field
-                            name="rma_mail_draft_confirmation_template_id"
-                            class="oe_inline"
-                            required="send_rma_draft_confirmation"
-                            context="{'default_model': 'rma'}"
-                        />
+                            class="col-12 col-lg-6 o_setting_box"
+                            title="Finish RMAs manually"
+                        >
+                            <div class="o_setting_left_pane">
+                                <field name="group_rma_manual_finalization" />
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label
+                                    for="group_rma_manual_finalization"
+                                    string="RMA Manual Finalization"
+                                />
+                                <div class="text-muted">
+                                    When the RMA is receive, allow to finsish it manually choosing
+                                    a finalization reason.
+                                </div>
+                            </div>
                         </div>
-                </setting>
+                        <div class="col-12 col-lg-6 o_setting_box">
+                            <div class="o_setting_left_pane">
+                                <field name="rma_return_grouping" />
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label for="rma_return_grouping" />
+                                <span
+                                    class="fa fa-lg fa-building-o"
+                                    title="Values set here are company-specific."
+                                    groups="base.group_multi_company"
+                                />
+                                <div
+                                    class="text-muted"
+                                >Group RMA returns by customer and warehouse.</div>
+                            </div>
+                        </div>
+                        <div
+                            class="col-12 col-lg-6 o_setting_box"
+                            title="Send automatic RMA info to customer"
+                        >
+                            <div class="o_setting_left_pane">
+                                <field name="send_rma_confirmation" />
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label
+                                    for="send_rma_confirmation"
+                                    string="RMA Confirmation Email"
+                                />
+                                <span
+                                    class="fa fa-lg fa-building-o"
+                                    title="Values set here are company-specific."
+                                    groups="base.group_multi_company"
+                                />
+                                <div
+                                    class="text-muted"
+                                >When the RMA is confirmed, send an automatic information email.</div>
+                                <div
+                                    class="row mt16"
+                                    invisible="not send_rma_confirmation"
+                                >
+                                    <label
+                                        for="rma_mail_confirmation_template_id"
+                                        string="Email Template"
+                                        class="col-lg-4 o_light_label"
+                                    />
+                                    <field
+                                        name="rma_mail_confirmation_template_id"
+                                        class="oe_inline"
+                                        required="send_rma_confirmation"
+                                        context="{'default_model': 'rma'}"
+                                    />
+                                </div>
+                            </div>
+                        </div>
+                        <div
+                            class="col-12 col-lg-6 o_setting_box"
+                            title="Send automatic RMA products reception notification to customer"
+                        >
+                            <div class="o_setting_left_pane">
+                                <field name="send_rma_receipt_confirmation" />
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label
+                                    for="send_rma_receipt_confirmation"
+                                    string="RMA Receipt Confirmation Email"
+                                />
+                                <span
+                                    class="fa fa-lg fa-building-o"
+                                    title="Values set here are company-specific."
+                                    groups="base.group_multi_company"
+                                />
+                                <div
+                                    class="text-muted"
+                                >When the RMA products are received, send an automatic information email.</div>
+                                <div
+                                    class="row mt16"
+                                    invisible="not send_rma_receipt_confirmation"
+                                >
+                                    <label
+                                        for="rma_mail_receipt_confirmation_template_id"
+                                        string="Email Template"
+                                        class="col-lg-4 o_light_label"
+                                    />
+                                    <field
+                                        name="rma_mail_receipt_confirmation_template_id"
+                                        class="oe_inline"
+                                        required="send_rma_receipt_confirmation"
+                                        context="{'default_model': 'rma'}"
+                                    />
+                                </div>
+                            </div>
+                        </div>
+                        <div
+                            class="col-12 col-lg-6 o_setting_box"
+                            title="Send automatic notification when the customer places an RMA"
+                        >
+                            <div class="o_setting_left_pane">
+                                <field name="send_rma_draft_confirmation" />
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <label
+                                    for="send_rma_draft_confirmation"
+                                    string="RMA draft notification Email"
+                                />
+                                <span
+                                    class="fa fa-lg fa-building-o"
+                                    title="Values set here are company-specific."
+                                    groups="base.group_multi_company"
+                                />
+                                <div
+                                    class="text-muted"
+                                >When customers themselves place an RMA from the portal, send an automatic notification acknowleging it.</div>
+                                <div
+                                    class="row mt16"
+                                    invisible="not send_rma_draft_confirmation"
+                                >
+                                    <label
+                                        for="rma_mail_draft_confirmation_template_id"
+                                        string="Email Template"
+                                        class="col-lg-4 o_light_label"
+                                    />
+                                    <field
+                                        name="rma_mail_draft_confirmation_template_id"
+                                        class="oe_inline"
+                                        required="send_rma_draft_confirmation"
+                                        context="{'default_model': 'rma'}"
+                                    />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </app>
             </xpath>
         </field>
     </record>
+
+    <record id="action_rma_config_settings" model="ir.actions.act_window">
+            <field name="name">Settings</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">res.config.settings</field>
+            <field name="view_mode">form</field>
+            <field name="target">inline</field>
+            <field name="context">{'module' : 'rma', 'bin_size': False}</field>
+        </record>
+
+        <menuitem
+        id="menu_rma_general_settings"
+        name="Settings"
+        parent="rma_configuration_menu"
+        sequence="0"
+        action="action_rma_config_settings"
+        groups="base.group_system"
+    />
 </odoo>