diff --git a/addons/hr_timesheet/views/project_views.xml b/addons/hr_timesheet/views/project_views.xml
index 643ee53acb8..a1a037a088d 100644
--- a/addons/hr_timesheet/views/project_views.xml
+++ b/addons/hr_timesheet/views/project_views.xml
@@ -63,17 +63,9 @@
             <field name="priority">24</field>
             <field name="arch" type="xml">
                 <xpath expr="//div[hasclass('o_settings_container')]" position="inside">
-                    <div class="col-lg-6 o_setting_box">
-                        <div class="o_setting_left_pane">
-                            <field name="allow_timesheets"/>
-                        </div>
-                        <div class="o_setting_right_pane">
-                            <label for="allow_timesheets" string="Timesheets"/>
-                            <div class="text-muted">
-                                Log time on tasks
-                            </div>
-                        </div>
-                    </div>
+                    <setting string="Timesheets" help="Log time on tasks">
+                        <field name="allow_timesheets"/>
+                    </setting>
                 </xpath>
             </field>
         </record>
@@ -91,17 +83,9 @@
                     <attribute name="invisible">0</attribute>
                 </xpath>
                 <xpath expr="//group[@name='group_time_managment']" position="inside">
-                    <div class="o_setting_box" id="timesheet_settings" colspan="2">
-                        <div class="o_setting_left_pane">
-                            <field name="allow_timesheets"/>
-                        </div>
-                        <div class="o_setting_right_pane">
-                            <label for="allow_timesheets" string="Timesheets"/>
-                            <div class="text-muted">
-                                Log time on tasks
-                            </div>
-                        </div>
-                    </div>
+                    <setting id="timesheet_settings" string="Timesheets" help="Log time on tasks">
+                        <field name="allow_timesheets"/>
+                    </setting>
                 </xpath>
             </field>
         </record>
diff --git a/addons/point_of_sale/views/pos_config_view.xml b/addons/point_of_sale/views/pos_config_view.xml
index 6ed34878bdf..66ac4e96cbe 100644
--- a/addons/point_of_sale/views/pos_config_view.xml
+++ b/addons/point_of_sale/views/pos_config_view.xml
@@ -32,55 +32,29 @@
 
                     <!-- SHOW this div in create_mode (when '+ New Shop' is clicked in the general settings.) -->
                     <div class="row mt16 o_settings_container" invisible="not context.get('pos_config_create_mode', False)">
-                        <div class="col-12 col-lg-6 o_setting_box">
-                            <div class="o_setting_left_pane">
+                        <setting>
                                 <field name="module_pos_restaurant" />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="module_pos_restaurant"/>
-                            </div>
-                        </div>
+                        </setting>
                     </div>
 
                     <!-- HIDE this div in create_mode (when '+ New Shop' is clicked in the general settings.) -->
                     <div class="row mt16 o_settings_container" invisible="context.get('pos_config_create_mode', False)">
-                        <div class="col-12 col-lg-6 o_setting_box"
-                             title="Employees can scan their badge or enter a PIN to log in to a PoS session. These credentials are configurable in the *HR Settings* tab of the employee form.">
-                            <div class="o_setting_left_pane">
-                                <field name="module_pos_hr" attrs="{'readonly': [('has_active_session','=', True)]}" />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <span class="o_form_label">Multi Employees per Session</span>
-                                <div class="text-muted">
-                                    Allow to log and switch between selected Employees
-                                </div>
-                                <div class="content-group mt16" attrs="{'invisible': [('module_pos_hr','=',False)]}">
-                                    <div class="text-warning" id="warning_text_employees">
-                                        Save this page and come back here to set up the feature.
-                                    </div>
+                        <setting
+                                title="Employees can scan their badge or enter a PIN to log in to a PoS session. These credentials are configurable in the *HR Settings* tab of the employee form."
+                                string="Multi Employees per Session"
+                                help="Allow to log and switch between selected Employees">
+                            <field name="module_pos_hr" attrs="{'readonly': [('has_active_session','=', True)]}" />
+                            <div class="content-group mt16" attrs="{'invisible': [('module_pos_hr','=',False)]}">
+                                <div class="text-warning" id="warning_text_employees">
+                                    Save this page and come back here to set up the feature.
                                 </div>
                             </div>
-                        </div>
-                        <div class="col-12 col-lg-6 o_setting_box" id="other_devices">
-                            <div class="o_setting_left_pane">
-                                <field name="other_devices" />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="other_devices" string="ePos Printer"/>
-                                <div class="text-muted mb16">
-                                    Connect device to your PoS without an IoT Box
-                                </div>
-                            </div>
-                        </div>
-                        <div class="col-12 col-lg-6 o_setting_box">
-                            <div class="o_setting_left_pane">
+                        </setting>
+                        <setting id="other_devices" string="ePos Printer" help="Connect device to your PoS without an IoT Box">
+                            <field name="other_devices" />
+                        </setting>
+                        <setting string="IoT Box" help="Connect devices using an IoT Box">
                                 <field name="is_posbox" />
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="is_posbox" string="IoT Box"/>
-                                <div class="text-muted mb16">
-                                    Connect devices using an IoT Box
-                                </div>
                                 <div class="content-group pos_iot_config" attrs="{'invisible' : [('is_posbox', '=', False)]}">
                                     <div class="row">
                                         <label string="IoT Box IP Address" for="proxy_ip" class="col-lg-4 o_light_label"/>
@@ -107,8 +81,7 @@
                                         <field name="iface_customer_facing_display_via_proxy"/>
                                     </div>
                                 </div>
-                            </div>
-                        </div>
+                        </setting>
                         <div groups="base.group_system">
                             <p>
                                 More settings: <a href="#" name="%(action_pos_configuration)d" type="action" class="btn-link o_form_uri" role="button">Configurations > Settings</a>
diff --git a/addons/pos_epson_printer/views/pos_config_views.xml b/addons/pos_epson_printer/views/pos_config_views.xml
index 1231f0024fc..8f75d6ebfd6 100644
--- a/addons/pos_epson_printer/views/pos_config_views.xml
+++ b/addons/pos_epson_printer/views/pos_config_views.xml
@@ -5,7 +5,7 @@
         <field name="model">pos.config</field>
         <field name="inherit_id" ref="point_of_sale.pos_config_view_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//div[@id='other_devices']//div[hasclass('o_setting_right_pane')]" position="inside">
+            <xpath expr="//setting[@id='other_devices']" position="inside">
                 <div class="content-group" attrs="{'invisible' : [('other_devices', '=', False)]}">
                     <field name="epson_printer_ip" placeholder="Epson Receipt Printer IP Address" />
                     <div class="row" attrs="{'invisible': [('epson_printer_ip', 'in', [False, ''])]}">
diff --git a/addons/project/views/project_views.xml b/addons/project/views/project_views.xml
index 0c6ece61a20..5d90fce4f94 100644
--- a/addons/project/views/project_views.xml
+++ b/addons/project/views/project_views.xml
@@ -556,79 +556,39 @@
                             <group>
                                 <group name="group_tasks_managment" string="Tasks Management" col="1" class="row mt16 o_settings_container" groups="project.group_subtask_project,project.group_project_task_dependencies,project.group_project_milestone,project.group_project_recurring_tasks">
                                     <div>
-                                        <div class="o_setting_box" id="subtask_settings" groups="project.group_subtask_project">
-                                            <div class="o_setting_left_pane">
-                                                <field name="allow_subtasks"/>
-                                            </div>
-                                            <div class="o_setting_right_pane">
-                                                <label for="allow_subtasks"/>
-                                                <div class="text-muted">
-                                                    Split your tasks to organize your work into sub-milestones
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="o_setting_box mt-4" id="recurring_tasks_setting" groups="project.group_project_recurring_tasks">
-                                            <div class="o_setting_left_pane">
-                                                <field name="allow_recurring_tasks"/>
-                                            </div>
-                                            <div class="o_setting_right_pane">
-                                                <label for="allow_recurring_tasks"/>
-                                                <div class="text-muted">
-                                                    Auto-generate tasks for regular activities
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="o_setting_box mt-4" id="task_dependencies_setting" groups="project.group_project_task_dependencies">
-                                            <div class="o_setting_left_pane">
-                                                <field name="allow_task_dependencies"/>
-                                            </div>
-                                            <div class="o_setting_right_pane">
-                                                <label for="allow_task_dependencies"/>
-                                                <div class="text-muted">
-                                                    Determine the order in which to perform tasks
-                                                </div>
-                                            </div>
-                                        </div>
-                                        <div class="o_setting_box mt-4" id="project_milestone_setting" groups="project.group_project_milestone">
-                                            <div class="o_setting_left_pane">
-                                                <field name="allow_milestones"/>
-                                            </div>
-                                            <div class="o_setting_right_pane">
-                                                <label for="allow_milestones"/>
-                                                <div class="text-muted">
-                                                    Track major progress points that must be reached to achieve success
-                                                </div>
-                                            </div>
-                                        </div>
+                                        <setting id="subtask_settings" help="Split your tasks to organize your work into sub-milestones" groups="project.group_subtask_project">
+                                            <field name="allow_subtasks"/>
+                                        </setting>
+                                        <setting id="recurring_tasks_setting" help="Auto-generate tasks for regular activities" groups="project.group_project_recurring_tasks">
+                                            <field name="allow_recurring_tasks"/>
+                                        </setting>
+                                        <setting id="task_dependencies_setting" help="Determine the order in which to perform tasks" groups="project.group_project_task_dependencies">
+                                            <field name="allow_task_dependencies"/>
+                                        </setting>
+                                        <setting id="project_milestone_setting" help="Track major progress points that must be reached to achieve success" groups="project.group_project_milestone">
+                                            <field name="allow_milestones"/>
+                                        </setting>
                                     </div>
                                 </group>
                                 <group name="group_time_managment" string="Time Management" invisible="1" col="1" class="row mt16 o_settings_container"/>
                                 <group name="group_documents_analytics" string="Analytics" col="1" class="row mt16 o_settings_container" attrs="{'invisible': [('allow_rating', '=', False)]}">
                                     <div>
                                         <field name="allow_rating" invisible="1"/>
-                                        <div class="o_setting_box" name="analytic_div" groups="project.group_project_rating">
-                                            <div class="o_setting_left_pane">
-                                                <field name="rating_active"/>
-                                            </div>
-                                            <div class="o_setting_right_pane">
-                                                <label for="rating_active" />
-                                                <div class="text-muted">
-                                                    Get customer feedback
+                                        <setting name="analytic_div" help="Get customer feedback" groups="project.group_project_rating">
+                                            <field name="rating_active"/>
+                                            <div class="mt16" attrs="{'invisible':[('rating_active','==',False)]}">
+                                                <field name="rating_status" widget="radio" />
+                                                <div  attrs="{'required': [('rating_status','=','periodic')], 'invisible': [('rating_status','!=','periodic')]}">
+                                                    <label for="rating_status_period"/>
+                                                    <field name="rating_status_period"/>
                                                 </div>
-                                                <div class="mt16" attrs="{'invisible':[('rating_active','==',False)]}">
-                                                    <field name="rating_status" widget="radio" />
-                                                    <div  attrs="{'required': [('rating_status','=','periodic')], 'invisible': [('rating_status','!=','periodic')]}">
-                                                        <label for="rating_status_period"/>
-                                                        <field name="rating_status_period"/>
-                                                    </div>
-                                                    <div class="content-group">
-                                                        <div class="mt8">
-                                                            <button name="%(project.open_task_type_form_domain)d" context="{'project_id':id}" icon="fa-arrow-right" type="action" string="Set a Rating Email Template on Stages" class="btn-link"/>
-                                                        </div>
+                                                <div class="content-group">
+                                                    <div class="mt8">
+                                                        <button name="%(project.open_task_type_form_domain)d" context="{'project_id':id}" icon="fa-arrow-right" type="action" string="Set a Rating Email Template on Stages" class="btn-link"/>
                                                     </div>
                                                 </div>
                                             </div>
-                                        </div>
+                                        </setting>
                                     </div>
                                 </group>
                             </group>
diff --git a/addons/sale_project/views/project_task_views.xml b/addons/sale_project/views/project_task_views.xml
index 59c6e6e243a..8cc156e0aaa 100644
--- a/addons/sale_project/views/project_task_views.xml
+++ b/addons/sale_project/views/project_task_views.xml
@@ -56,17 +56,9 @@
             <xpath expr="//group[@name='group_time_managment']" position="after">
                  <group name="group_sales_invoicing" string="Sales &amp; Invoicing" col="1" class="row mt16 o_settings_container col-lg-6">
                     <div>
-                        <div class="o_setting_box" id="allow_billable_container">
-                            <div class="o_setting_left_pane">
-                                <field name="allow_billable"/>
-                            </div>
-                            <div class="o_setting_right_pane">
-                                <label for="allow_billable"/>
-                                <div class="text-muted" id="allow_billable_setting">
-                                    Invoice your time and material to customers
-                                </div>
-                            </div>
-                        </div>
+                        <setting help="Invoice your time and material to customers" id="allow_billable_container">
+                            <field name="allow_billable"/>
+                        </setting>
                     </div>
                 </group>
             </xpath>
diff --git a/addons/sale_timesheet/views/project_task_views.xml b/addons/sale_timesheet/views/project_task_views.xml
index 50e5f5f7d6c..cd709fff54f 100644
--- a/addons/sale_timesheet/views/project_task_views.xml
+++ b/addons/sale_timesheet/views/project_task_views.xml
@@ -35,19 +35,11 @@
         <field name="model">project.project</field>
         <field name="inherit_id" ref="hr_timesheet.project_project_view_form_simplified_inherit_timesheet"/>
         <field name="arch" type="xml">
-            <xpath expr="//div[hasclass('o_setting_box')]" position="before">
-                <div class="col-lg-6 o_setting_box">
-                    <div class="o_setting_left_pane">
-                        <field name="company_id" invisible="1"/>
-                        <field name="allow_billable"/>
-                    </div>
-                    <div class="o_setting_right_pane">
-                        <label for="allow_billable"/>
-                        <div class="text-muted" id="allow_billable_setting">
-                            Invoice your time and material to customers
-                        </div>
-                    </div>
-                </div>
+            <xpath expr="//setting" position="before">
+                <field name="company_id" invisible="1"/>
+                <setting help="Invoice your time and material to customers">
+                    <field name="allow_billable"/>
+                </setting>
             </xpath>
         </field>
     </record>