diff --git a/invoice.xml b/invoice.xml
index 86a02abc90..f5fbc0e694 100644
--- a/invoice.xml
+++ b/invoice.xml
@@ -856,14 +856,14 @@ this repository contains the full copyright notices and license terms. -->
             <field name="arch" type="xml">
                 <![CDATA[
                 <form string="Print Invoice" col="2">
-                    <separator string="&lt;b&gt;Warning!&lt;/b&gt;" colspan="2"
-                        xalign="0.5" id="warning"/>
-                    <image name="tryton-dialog-information"/>
+                    <image name="tryton-dialog-warning" xexpand="0" xfill="0"/>
                     <group col="1" id="labels">
                         <label string="You have selected more than one invoice to print."
-                            xalign="0.0" id="selected"/>
+                            id="selected"
+                            yalign="0.0" xalign="0.0" xexpand="1"/>
                         <label string="The invoices will be sent &lt;i&gt;directly&lt;/i&gt; to the printer."
-                            xalign="0.0" id="printer"/>
+                            id="printer"
+                            yalign="0.0" xalign="0.0" xexpand="1"/>
                     </group>
                 </form>
                 ]]>
@@ -887,10 +887,12 @@ this repository contains the full copyright notices and license terms. -->
             <field name="arch" type="xml">
                 <![CDATA[
                 <form string="Credit Invoice" col="2">
-                    <image name="tryton-dialog-information"/>
+                    <image name="tryton-dialog-information" xexpand="0"
+                        xfill="0"/>
                     <group col="2" id="credit_refund">
                         <label string="Are you sure to credit those/this invoice(s)?"
-                            xalign="0.0" id="credit" colspan="2"/>
+                            id="credit" colspan="2"
+                            yalign="0.0" xalign="0.0" xexpand="1"/>
                         <label name="with_refund"/>
                         <field name="with_refund"/>
                     </group>
diff --git a/payment_term.xml b/payment_term.xml
index 3ebdae8d38..309ed267d1 100644
--- a/payment_term.xml
+++ b/payment_term.xml
@@ -13,38 +13,44 @@ this repository contains the full copyright notices and license terms. -->
                     <field name="name"/>
                     <label name="active"/>
                     <field name="active" xexpand="0" width="100"/>
-                    <field name="description" colspan="4"/>
-                    <field name="lines" colspan="4">
-                        <tree string="Payment Term Line" sequence="sequence">
-                            <field name="type"/>
-                            <field name="percentage"/>
-                            <field name="amount"/>
-                            <field name="currency"/>
-                            <field name="days"/>
-                            <field name="delay"/>
-                            <field name="sequence" tree_invisible="1"/>
-                            <field name="currency_digits" tree_invisible="1"/>
-                        </tree>
-                        <form string="Payment Term Lines">
-                            <label name="type"/>
-                            <field name="type"/>
-                            <group col="1" id="label_amount_percent">
-                                <label name="percentage" yfill="1" xexpand="1" yexpand="1"/>
-                                <label name="amount" yfill="1" xexpand="1" yexpand="1"/>
-                            </group>
-                            <group col="3" id="amount_percent">
-                                <field name="percentage" colspan="3"/>
-                                <field name="amount"/>
-                                <label name="currency"/>
-                                <field name="currency"/>
-                            </group>
-                            <label name="days"/>
-                            <field name="days"/>
-                            <label name="delay"/>
-                            <field name="delay"/>
-                            <field name="currency_digits" invisible="1"/>
-                        </form>
-                    </field>
+                    <notebook colspan="4">
+                        <page name="lines">
+                            <field name="lines" colspan="4">
+                                <tree string="Payment Term Line" sequence="sequence">
+                                    <field name="type"/>
+                                    <field name="percentage"/>
+                                    <field name="amount"/>
+                                    <field name="currency"/>
+                                    <field name="days"/>
+                                    <field name="delay"/>
+                                    <field name="sequence" tree_invisible="1"/>
+                                    <field name="currency_digits" tree_invisible="1"/>
+                                </tree>
+                                <form string="Payment Term Lines">
+                                    <label name="type"/>
+                                    <field name="type"/>
+                                    <group col="1" id="label_amount_percent">
+                                        <label name="percentage" yfill="1" xexpand="1" yexpand="1"/>
+                                        <label name="amount" yfill="1" xexpand="1" yexpand="1"/>
+                                    </group>
+                                    <group col="3" id="amount_percent">
+                                        <field name="percentage" colspan="3"/>
+                                        <field name="amount"/>
+                                        <label name="currency"/>
+                                        <field name="currency"/>
+                                    </group>
+                                    <label name="days"/>
+                                    <field name="days"/>
+                                    <label name="delay"/>
+                                    <field name="delay"/>
+                                    <field name="currency_digits" invisible="1"/>
+                                </form>
+                            </field>
+                        </page>
+                        <page name="description">
+                            <field name="description" colspan="4"/>
+                        </page>
+                    </notebook>
                 </form>
                 ]]>
             </field>