diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 120d901a006..658f87962ff 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -79,10 +79,10 @@ class account_config_settings(osv.osv_memory):
         'purchase_refund_sequence_prefix': fields.related('purchase_refund_journal_id', 'sequence_id', 'prefix', type='char', string='Supplier credit note sequence'),
         'purchase_refund_sequence_next': fields.related('purchase_refund_journal_id', 'sequence_id', 'number_next', type='integer', string='Next supplier credit note number'),
 
-        'module_account_check_writing': fields.boolean('pay your supplier by check',
+        'module_account_check_writing': fields.boolean('pay your suppliers by check',
             help="""This allows you to check writing and printing.
                 This installs the module account_check_writing."""),
-        'module_account_accountant': fields.boolean('accountant features',
+        'module_account_accountant': fields.boolean('full accounting features: journals, legal statements, chart of accounts, etc.',
             help="""If you do not check this box, you will be able to do invoicing & payments, but not accounting (Journal Items, Chart of  Accounts, ...)"""),
         'module_account_asset': fields.boolean('assets management',
             help="""This allows you to manage the assets owned by a company or a person.
@@ -99,7 +99,7 @@ class account_config_settings(osv.osv_memory):
                     * serve as base for an easy plug-in of various automated payment mechanisms, and
                     * provide a more efficient way to manage invoice payments.
                 This installs the module account_payment."""),
-        'module_account_voucher': fields.boolean('anage customer payments',
+        'module_account_voucher': fields.boolean('manage customer payments',
             help="""This includes all the basic requirements of voucher entries for bank, cash, sales, purchase, expense, contra, etc.
                 This installs the module account_voucher."""),
         'module_account_followup': fields.boolean('manage customer payment follow-ups',
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 1278a8f83cc..d19a5dc5f98 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -103,6 +103,39 @@
                             </div>
                         </div>
                     </group>
+                    <separator string="Accounting &amp; Finance"/>
+                    <group>
+                        <label for="id" string="Options"/>
+                        <div name="account_config">
+                            <div>
+                                <label for="currency_id"/>
+                                <field name="currency_id" class="oe_inline"/>
+                            </div>
+                            <div>
+                                <label for="decimal_precision"/>
+                                <field name="decimal_precision" class="oe_inline"/>
+                            </div>
+                            <div>
+                                <label for="tax_calculation_rounding_method"/>
+                                <field name="tax_calculation_rounding_method" class="oe_inline"/>
+                            </div>
+                        </div>
+                        <label for="id" string="Features"/>
+                        <div>
+                            <div>
+                                <field name="module_account_accountant" class="oe_inline"/>
+                                <label for="module_account_accountant"/>
+                            </div>
+                            <div>
+                                <field name="module_account_asset" class="oe_inline"/>
+                                <label for="module_account_asset"/>
+                            </div>
+                            <div>
+                                <field name="module_account_budget" class="oe_inline"/>
+                                <label for="module_account_budget"/>
+                            </div>
+                        </div>
+                    </group>
                     <separator string="eInvoicing &amp; Payments"/>
                     <group>
                         <label for="id" string="Customer"/>
@@ -187,55 +220,20 @@
                         <label for="id" string="Configuration"/>
                         <div>
                             <div>
-                                <label string="Configure your bank accounts"/>
                                 <button name="%(action_bank_tree)d"
-                                    string="Configure"
+                                    string="Configure your bank accounts"
                                     icon="gtk-go-forward"
                                     type="action"
                                     class="oe_inline oe_link"/>
+                                <label for="company_footer"/>
+                                <field name="company_footer"/>
                             </div>
-                            <p>
-                                <label for="company_footer"/>: <field name="company_footer" class="oe_inline"/>
-                            </p>
                             <div>
                                 <label for="paypal_account"/>
                                 <field name="paypal_account" placeholder="e.g. sales@openerp.com" class="oe_inline"/>
                             </div>
                         </div>
                     </group>
-                    <separator string="Accounting &amp; Finance"/>
-                    <group>
-                        <label for="id" string="Options"/>
-                        <div name="account_config">
-                            <div>
-                                <label for="currency_id"/>
-                                <field name="currency_id" class="oe_inline"/>
-                            </div>
-                            <div>
-                                <label for="decimal_precision"/>
-                                <field name="decimal_precision" class="oe_inline"/>
-                            </div>
-                            <div>
-                                <label for="tax_calculation_rounding_method"/>
-                                <field name="tax_calculation_rounding_method" class="oe_inline"/>
-                            </div>
-                        </div>
-                        <label for="id" string="Features"/>
-                        <div>
-                            <div>
-                                <field name="module_account_accountant" class="oe_inline"/>
-                                <label for="module_account_accountant"/>
-                            </div>
-                            <div>
-                                <field name="module_account_asset" class="oe_inline"/>
-                                <label for="module_account_asset"/>
-                            </div>
-                            <div>
-                                <field name="module_account_budget" class="oe_inline"/>
-                                <label for="module_account_budget"/>
-                            </div>
-                        </div>
-                    </group>
                     <separator name="analytic_account" string="Analytic Accounting" invisible="1"/>
                     <group name="analytic_account_sale" invisible="1">
                         <label for="id" string="Sale"/>
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index f4c1f1ad08b..7a0aa615b2d 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -40,10 +40,9 @@
                                 <label for="module_portal"/>
                             </div>
                             <div>
-                                <label string="Configure outgoing email servers"/>
                                 <button type="action"
                                     name="%(base.action_ir_mail_server_list)d"
-                                    string="Configure" icon="gtk-execute" class="oe_link"/>
+                                    string="Configure outgoing email servers" class="oe_link"/>
                             </div>
                         </div>
                     </group>
diff --git a/addons/stock/res_config.py b/addons/stock/res_config.py
index ab45c6b1a8d..2e7018f4409 100644
--- a/addons/stock/res_config.py
+++ b/addons/stock/res_config.py
@@ -29,7 +29,7 @@ class stock_config_settings(osv.osv_memory):
         'module_claim_from_delivery': fields.boolean("allow claim on deliveries",
             help="""Adds a Claim link to the delivery order.
                 This installs the module claim_from_delivery."""),
-        'module_stock_invoice_directly': fields.boolean("generate invoice directly from the picking",
+        'module_stock_invoice_directly': fields.boolean("create and open the invoice when the user finish a delivery order",
             help="""This allows to automatically launch the invoicing wizard if the delivery is
                 to be invoiced when you send or deliver goods.
                 This installs the module stock_invoice_directly."""),
@@ -53,7 +53,7 @@ class stock_config_settings(osv.osv_memory):
             implied_group='product.group_uos',
             help="""Allows you to sell units of a product, but invoice based on a different unit of measure.
                 For instance, you can sell pieces of meat that you invoice based on their weight."""),
-        'group_stock_packaging': fields.boolean("manage product packaging",
+        'group_stock_packaging': fields.boolean("allow to define several packaging methods on products",
             implied_group='product.group_stock_packaging',
             help="""Allows you to create and manage your packaging dimensions and types you want to be maintained in your system."""),
         'group_stock_production_lot': fields.boolean("track serial number on products",
diff --git a/addons/stock/res_config_view.xml b/addons/stock/res_config_view.xml
index acf3e9eda10..f6668eff316 100644
--- a/addons/stock/res_config_view.xml
+++ b/addons/stock/res_config_view.xml
@@ -13,7 +13,7 @@
                         or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
-                    <separator string="Traceability &amp; Accounting"/>
+                    <separator string="Traceability"/>
                     <group>
                         <label for="id" string="Traceability"/>
                         <div>
@@ -31,6 +31,7 @@
                             </div>
                         </div>    
                     </group>
+                    <separator string="Accounting"/>
                     <group>
                         <label for="id" string="Accounting"/>
                         <div>