diff --git a/inventory.xml b/inventory.xml
index 1fdff6f805..0ff605c4f2 100644
--- a/inventory.xml
+++ b/inventory.xml
@@ -42,11 +42,11 @@ this repository contains the full copyright notices and license terms. -->
                                 <button string="Cancel"
                                     name="cancel"
                                     states="{'invisible': In(Eval('state'), ['cancel', 'done']), 'readonly': Not(In(%(group_stock)d, Eval('groups', [])))}"
-                                    icon="'tryton-cancel'" />
+                                    icon="tryton-cancel" />
                                 <button string="Confirm"
                                     name="done"
                                     states="{'invisible': In(Eval('state'), ['done','cancel']), 'readonly': Not(In(%(group_stock)d, Eval('groups', [])))}"
-                                    icon="'tryton-ok'"/>
+                                    icon="tryton-ok"/>
                             </group>
                         </group>
                     </form>
diff --git a/period.xml b/period.xml
index 6e854a86e4..e46cebdbde 100644
--- a/period.xml
+++ b/period.xml
@@ -17,9 +17,11 @@ this repository contains the full copyright notices and license terms. -->
                     <field name="state"/>
                     <group col="2" colspan="2" id="buttons">
                         <button name="button_draft" type="object" string="Draft"
-                            states="{'invisible': Equal(Eval('state'), 'draft'), 'readonly': Not(In(%(group_stock_admin)d, Eval('groups', [])))}"/>
+                            states="{'invisible': Equal(Eval('state'), 'draft'), 'readonly': Not(In(%(group_stock_admin)d, Eval('groups', [])))}"
+                            icon="tryton-clear"/>
                         <button name="button_close" type="object" string="Close"
-                            states="{'invisible': Equal(Eval('state'), 'closed'), 'readonly': Not(In(%(group_stock_admin)d, Eval('groups', [])))}"/>
+                            states="{'invisible': Equal(Eval('state'), 'closed'), 'readonly': Not(In(%(group_stock_admin)d, Eval('groups', [])))}"
+                            icon="tryton-ok"/>
                     </group>
                 </form>
                 ]]>
diff --git a/shipment.xml b/shipment.xml
index a6903fddd1..304a2014e8 100644
--- a/shipment.xml
+++ b/shipment.xml
@@ -243,11 +243,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="arch" type="xml">
                 <![CDATA[
                 <form string="Unable to Assign" col="2">
-                    <image name="tryton-dialog-information"/>
+                    <image name="tryton-dialog-warning" xexpand="0" xfill="0"/>
                     <separator string="Unable to assign those products:"
                         id="unable"/>
-                    <label id="empty"/>
-                    <field name="moves">
+                    <field name="moves" colspan="2">
                         <tree string="Moves" fill="1">
                             <field name="product"/>
                             <field name="quantity"/>
@@ -446,11 +445,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="arch" type="xml">
                 <![CDATA[
                 <form string="Unable to Assign" col="2">
-                    <image name="tryton-dialog-information"/>
+                    <image name="tryton-dialog-warning" xexpand="0" xfill="0"/>
                     <separator string="Unable to assign those products:"
                         id="unable"/>
-                    <label id="empty"/>
-                    <field name="inventory_moves">
+                    <field name="inventory_moves" colspan="2">
                         <tree string="Inventory Moves" fill="1">
                             <field name="product"/>
                             <field name="quantity"/>
@@ -624,11 +622,10 @@ this repository contains the full copyright notices and license terms. -->
             <field name="arch" type="xml">
                 <![CDATA[
                 <form string="Unable to Assign" col="2">
-                    <image name="tryton-dialog-information"/>
+                    <image name="tryton-dialog-warning" xexpand="0" xfill="0"/>
                     <separator string="Unable to assign those products:"
                         id="unable"/>
-                    <label id="empty"/>
-                    <field name="moves">
+                    <field name="moves" colspan="2">
                         <tree string="Moves"  fill="1">
                             <field name="product"/>
                             <field name="quantity"/>