diff --git a/addons/account/models/account_move.py b/addons/account/models/account_move.py
index e3f56107407..ddd9a822dfb 100644
--- a/addons/account/models/account_move.py
+++ b/addons/account/models/account_move.py
@@ -167,7 +167,7 @@ class AccountMove(models.Model):
         help='Technical field used to fit the generic behavior in mail templates.')
     is_move_sent = fields.Boolean(readonly=True, default=False, copy=False,
         help="It indicates that the invoice/payment has been sent.")
-    partner_bank_id = fields.Many2one('res.partner.bank', string='Bank Account',
+    partner_bank_id = fields.Many2one('res.partner.bank', string='Recipient Bank',
         help='Bank Account Number to which the invoice will be paid. A Company bank account if this is a Customer Invoice or Vendor Credit Note, otherwise a Partner bank account number.',
         check_company=True)
     payment_reference = fields.Char(string='Payment Reference', index=True, copy=False,
diff --git a/addons/account/views/account_move_views.xml b/addons/account/views/account_move_views.xml
index e8339d8caf0..76c09bb8509 100644
--- a/addons/account/views/account_move_views.xml
+++ b/addons/account/views/account_move_views.xml
@@ -998,8 +998,7 @@
                                         <label for="ref" string="Customer Reference" />
                                         <field name="ref" nolabel="1"/>
                                         <field name="invoice_user_id" domain="[('share', '=', False)]" widget="many2one_avatar_user"/>
-                                        <field name="invoice_origin" string="Source Document" force_save="1"
-                                               attrs="{'invisible': [('invoice_origin', '=', False)]}"/>
+                                        <field name="invoice_origin" string="Source Document" force_save="1" invisible="1"/>
                                         <field name="partner_bank_id"
                                                context="{'default_partner_id': commercial_partner_id}"
                                                domain="[('partner_id', '=', bank_partner_id)]"
diff --git a/addons/account_edi/wizard/account_invoice_send_views.xml b/addons/account_edi/wizard/account_invoice_send_views.xml
index 023a56ef709..fe1c1b15920 100644
--- a/addons/account_edi/wizard/account_invoice_send_views.xml
+++ b/addons/account_edi/wizard/account_invoice_send_views.xml
@@ -7,18 +7,14 @@
             <field name="inherit_id" ref="account.account_invoice_send_wizard_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//div[@name='mail_form']" position='before'>
-                    <div name="edi_format_option">
+                    <div name="edi_format_option" attrs="{'invisible':[('edi_format_ids', '=', [])]}">
                         <group>
                             <label for="edi_format_ids"/>
                             <div class="oe_inline">
                                 <field name="edi_format_ids"
                                         nolabel="1"
                                         widget="many2many_tags" 
-                                        placeholder="You can set default electronic invoicing formats on the journal"
-                                        attrs="{'invisible':[('edi_format_ids', '=', [])]}"/>
-                                <div attrs="{'invisible':[('edi_format_ids', '!=', [])]}">
-                                    <i>Please, set electronic invoicing formats on the journal</i>
-                                </div>
+                                        placeholder="You can set default electronic invoicing formats on the journal"/>
                             </div>
                         </group>
                     </div>
diff --git a/odoo/addons/base/wizard/base_document_layout_views.xml b/odoo/addons/base/wizard/base_document_layout_views.xml
index ad40a5301e0..d18b469ee20 100644
--- a/odoo/addons/base/wizard/base_document_layout_views.xml
+++ b/odoo/addons/base/wizard/base_document_layout_views.xml
@@ -13,17 +13,17 @@
                             <field name="custom_colors" invisible="1" />
                             <field name="logo_primary_color" invisible="1" />
                             <field name="logo_secondary_color" invisible="1" />
-                            <field name="report_layout_id" widget="radio" string="Layout" class="mb-4" />
-                            <field name="logo" widget="image" class="mb-4" />
+                            <field name="report_layout_id" widget="radio" string="Layout"/>
+                            <field name="logo" widget="image"/>
                             <label for="primary_color" string="Colors" />
                             <div class="o_document_layout_colors">
-                                <field name="primary_color" widget="color" class="mb-4" />
-                                <field name="secondary_color" widget="color" class="mb-4" />
+                                <field name="primary_color" widget="color"/>
+                                <field name="secondary_color" widget="color"/>
                                 <button class="btn btn-link" title="Reset to logo colors" attrs="{'invisible': [('custom_colors', '=', False)]}">
-                                    <label for="custom_colors" class="fa fa-refresh mb-4" string="" />
+                                    <label for="custom_colors" class="fa fa-refresh" string="" />
                                 </button>
                             </div>
-                            <field name="font" widget="font" class="mb-4" />
+                            <field name="font" widget="font"/>
                             <field name="report_header" widget="char" placeholder="e.g. Global Business Solutions" />
                             <field name="report_footer" string="Footer" placeholder="e.g. Opening hours, bank accounts (one per line)" />
                             <field name="paperformat_id" required="1" />