diff --git a/addons/hr_attendance/views/res_config_settings_views.xml b/addons/hr_attendance/views/res_config_settings_views.xml
index bbfaa8e9e6c..cce5bd5c681 100644
--- a/addons/hr_attendance/views/res_config_settings_views.xml
+++ b/addons/hr_attendance/views/res_config_settings_views.xml
@@ -30,8 +30,8 @@
                             <div class="mt16" attrs="{'invisible': [('hr_attendance_overtime', '=', False)],
                                                         'required': [('hr_attendance_overtime', '=', True)]}">
                                 <div class="mt16 row" title="Count of extra hours is considered from this date. Potential extra hours prior to this date are not considered.">
-                                    <label for="overtime_start_date" string="Start from" class="col-3 col-lg-3 o_light_label"/>
-                                    <field name="overtime_start_date" class="col-lg-3 p-0" attrs="{'required': [('hr_attendance_overtime', '=', True)]}" />
+                                    <label for="overtime_start_date" string="Start from" class="o_light_label col-lg-3"/>
+                                    <field name="overtime_start_date" class="col-lg-3 w-75" attrs="{'required': [('hr_attendance_overtime', '=', True)]}" />
                                 </div>
                                 <br/>
                                 <label for="overtime_company_threshold" class="o_form_label">
diff --git a/addons/mrp/views/res_config_settings_views.xml b/addons/mrp/views/res_config_settings_views.xml
index 1a37ca92c9a..844e67bc693 100644
--- a/addons/mrp/views/res_config_settings_views.xml
+++ b/addons/mrp/views/res_config_settings_views.xml
@@ -21,7 +21,7 @@
                                     </div>
                                 </div>
                                 <div id="workorder_settings_dependencies" class="row mt-2" attrs="{'invisible': [('group_mrp_routings','=',False)]}">
-                                    <field name="group_mrp_workorder_dependencies" class="col-lg-1 mr0"/>
+                                    <field name="group_mrp_workorder_dependencies" class="col flex-grow-0 ml16 mr0 pe-2"/>
                                     <div class="col ps-0">
                                         <label for="group_mrp_workorder_dependencies"/>
                                         <div class="text-muted">
@@ -39,7 +39,7 @@
                             <setting id="quality_control_mrp" help="Add quality checks to your work orders">
                                 <field name="module_quality_control" widget="upgrade_boolean"/>
                                 <div class="row mt-2" attrs="{'invisible': [('module_quality_control','=',False)]}">
-                                    <field name="module_quality_control_worksheet" widget="upgrade_boolean" class="col-lg-1 ml16 mr0"/>
+                                    <field name="module_quality_control_worksheet" widget="upgrade_boolean" class="col flex-grow-0 ml16 mr0 pe-2"/>
                                     <div class="col ps-0">
                                         <label for="module_quality_control_worksheet"/>
                                         <div class="text-muted">
diff --git a/addons/point_of_sale/views/res_config_settings_views.xml b/addons/point_of_sale/views/res_config_settings_views.xml
index 509be8ff008..e06ee536128 100644
--- a/addons/point_of_sale/views/res_config_settings_views.xml
+++ b/addons/point_of_sale/views/res_config_settings_views.xml
@@ -246,8 +246,10 @@
                                         <field name="pos_rounding_method" attrs="{'required' : [('pos_cash_rounding', '=', True)]}" domain="[('company_id', '=', company_id)]"/>
                                     </div>
                                     <div class="row mt16">
-                                        <label string="Only on cash methods" for="pos_only_round_cash_method" class="col-lg-3 o_light_label" />
-                                        <field name="pos_only_round_cash_method"/>
+                                        <div class="col">
+                                            <field name="pos_only_round_cash_method"/>
+                                            <label string="Only on cash methods" for="pos_only_round_cash_method" class="o_light_label" />
+                                        </div>
                                     </div>
                                 </div>
                                 <div class="mt8">
diff --git a/addons/stock/views/res_config_settings_views.xml b/addons/stock/views/res_config_settings_views.xml
index 850420956a8..ee017933146 100644
--- a/addons/stock/views/res_config_settings_views.xml
+++ b/addons/stock/views/res_config_settings_views.xml
@@ -17,7 +17,7 @@
                                      documentation="/applications/inventory_and_mrp/inventory/management/misc/batch_transfers.html">
                                 <field name="module_stock_picking_batch"/>
                                 <div class="row mt-2" attrs="{'invisible': [('module_stock_picking_batch','=',False)]}">
-                                    <field name="group_stock_picking_wave" class="col-lg-1 ml16 mr0"/>
+                                    <field name="group_stock_picking_wave" class="col flex-grow-0 ml16 mr0 pe-2"/>
                                     <div class="col ps-0">
                                         <label for="group_stock_picking_wave"/>
                                         <div class="text-muted">Process operations in wave transfers</div>
@@ -31,7 +31,7 @@
                                      documentation="/applications/inventory_and_mrp/manufacturing/management/quality_control.html">
                                 <field name="module_quality_control" widget="upgrade_boolean"/>
                                 <div class="row mt-2" attrs="{'invisible': [('module_quality_control','=',False)]}">
-                                    <field name="module_quality_control_worksheet" widget="upgrade_boolean" class="col-lg-1 ml16 mr0"/>
+                                    <field name="module_quality_control_worksheet" widget="upgrade_boolean" class="col flex-grow-0 ml16 mr0 pe-2"/>
                                     <div class="col ps-0">
                                         <label for="module_quality_control_worksheet"/>
                                         <div class="text-muted">
@@ -123,7 +123,7 @@
                             <setting id="full_traceability" help="Get a full traceability from vendors to customers" documentation="/applications/inventory_and_mrp/inventory/management/lots_serial_numbers/differences.html">
                                 <field name="group_stock_production_lot"/>
                                 <div class="row mt-2" attrs="{'invisible': [('group_stock_production_lot','=',False)]}">
-                                    <field name="group_stock_lot_print_gs1" class="col-lg-1 ml16 mr0"/>
+                                    <field name="group_stock_lot_print_gs1" class="col flex-grow-0 ml16 mr0 pe-2"/>
                                     <div class="col ps-0">
                                         <label for="group_stock_lot_print_gs1"/>
                                         <div class="text-muted">Use GS1 nomenclature datamatrix whenever barcodes are printed for lots and serial numbers.</div>
diff --git a/addons/web/static/src/views/form/setting/setting.scss b/addons/web/static/src/views/form/setting/setting.scss
index 6cebef8a6b8..ed6b8a2c9b6 100644
--- a/addons/web/static/src/views/form/setting/setting.scss
+++ b/addons/web/static/src/views/form/setting/setting.scss
@@ -23,12 +23,13 @@
     }
 
     .o_field_widget {
-      @include media-breakpoint-up(md) {
-         &:not(.o_field_boolean) {
+      &:not(.o_field_boolean) {
+         flex: 0 0 auto;
+
+         @include media-breakpoint-up(md) {
             width: 50%;
          }
       }
-       flex: 0 0 auto;
 
        &.o_field_many2manytags > .o_field_widget {
           flex: 1 0 50px;