diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 63cbed81739..27fd0d65b14 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1640,7 +1640,7 @@
                     <filter string="Purchase" icon="terp-purchase" domain="[('journal_id.type', '=', 'purchase')]"/>
                     <separator orientation="vertical"/>
                       <field name="name"/>
-                      <field name="journal_id"/>
+                      <field name="journal_id" widget="selection"/>
                       <field name="company_id" groups="base.group_multi_company"/>
                     </group>
                     <newline/>
diff --git a/addons/account_analytic_default/account_analytic_default_view.xml b/addons/account_analytic_default/account_analytic_default_view.xml
index b9f455d2231..5aad1f3521d 100644
--- a/addons/account_analytic_default/account_analytic_default_view.xml
+++ b/addons/account_analytic_default/account_analytic_default_view.xml
@@ -48,7 +48,7 @@
                     <field name="product_id"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
-                    <field name="company_id"/>
+                    <field name="company_id" widget="selection" groups="base.group_multi_company"/>
                 </search>
             </field>
         </record>
diff --git a/addons/account_followup/account_followup_view.xml b/addons/account_followup/account_followup_view.xml
index bbc3a8400a4..111870aa33b 100644
--- a/addons/account_followup/account_followup_view.xml
+++ b/addons/account_followup/account_followup_view.xml
@@ -73,7 +73,8 @@
                 <search string="Search Followup">
                    <group col="10" colspan="4">
                         <field name="name"/>
-                    </group>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                   </group>
                </search>
             </field>
         </record>
diff --git a/addons/account_invoice_layout/account_invoice_layout_view.xml b/addons/account_invoice_layout/account_invoice_layout_view.xml
index fdd4fa0781f..c9d3e32e892 100644
--- a/addons/account_invoice_layout/account_invoice_layout_view.xml
+++ b/addons/account_invoice_layout/account_invoice_layout_view.xml
@@ -75,7 +75,8 @@
                 <separator string="Write a notification or a wishful message." colspan="4"/>
                 <field name="name" select="1" colspan="2" />
                 <newline/>
-                <field name="msg" select="1" colspan="2"/>
+                <separator string="Special Message" colspan="4"/>
+                <field name="msg" select="1" nolabel="1" colspan="2"/>
             </form>
         </field>
     </record>
diff --git a/addons/account_payment/account_payment_view.xml b/addons/account_payment/account_payment_view.xml
index 01c8965f9a4..915da5c0f27 100644
--- a/addons/account_payment/account_payment_view.xml
+++ b/addons/account_payment/account_payment_view.xml
@@ -40,6 +40,23 @@
 
         <menuitem id="menu_main_payment" name="Payment" parent="account.menu_finance" sequence="6"/>
 
+        <record id="view_payment_mode_search" model="ir.ui.view">
+            <field name="name">payment.mode.search</field>
+            <field name="model">payment.mode</field>
+            <field name="type">search</field>
+            <field name="arch" type="xml">
+                <form string="Payment Mode">
+                    <field name="name"/>
+                    <field name="journal" widget='selection'/>
+                    <field name="company_id" widget='selection' groups="base.group_multi_company"/>
+                    <newline/>
+                    <group expand="0" string="Group By...">
+                      <filter string="Journal" icon="terp-folder-orange" domain="[]" context="{'group_by':'journal'}"/>
+                    </group>
+                </form>
+            </field>
+        </record>
+
         <record id="view_payment_mode_tree" model="ir.ui.view">
             <field name="name">payment.mode.tree</field>
             <field name="model">payment.mode</field>
@@ -52,6 +69,7 @@
                 </tree>
             </field>
         </record>
+
         <record id="view_payment_mode_form" model="ir.ui.view">
             <field name="name">payment.mode.form</field>
             <field name="model">payment.mode</field>
@@ -69,7 +87,8 @@
             <field name="name">Payment Mode</field>
             <field name="res_model">payment.mode</field>
             <field name="view_type">form</field>
-            <field name="view_mode">tree,form</field>
+            <field name="view_mode">tree,form,search</field>
+            <field name="search_view_id" ref="view_payment_mode_search"/>
         </record>
 
         <menuitem action="action_payment_mode_form" id="menu_action_payment_mode_form" parent="account.menu_configuration_misc"/>