diff --git a/trytond/ir/ui/board.rnc b/trytond/ir/ui/board.rnc
index 226083eb29..82c81958c0 100644
--- a/trytond/ir/ui/board.rnc
+++ b/trytond/ir/ui/board.rnc
@@ -22,6 +22,9 @@ attlist.image &= [ a:defaultValue = "1" ] attribute colspan { text }?
 attlist.image &=
   [ a:defaultValue = "0" ] attribute yexpand { "0" | "1" }?
 attlist.image &= [ a:defaultValue = "0" ] attribute yfill { "0" | "1" }?
+attlist.image &=
+  [ a:defaultValue = "0" ] attribute xexpand { "0" | "1" }?
+attlist.image &= [ a:defaultValue = "0" ] attribute xfill { "0" | "1" }?
 attlist.image &= attribute help { text }?
 attlist.image &= attribute states { text }?
 separator = element separator { attlist.separator, empty }
@@ -36,6 +39,10 @@ attlist.separator &=
   [ a:defaultValue = "0" ] attribute yexpand { "0" | "1" }?
 attlist.separator &=
   [ a:defaultValue = "0" ] attribute yfill { "0" | "1" }?
+attlist.separator &=
+  [ a:defaultValue = "0" ] attribute xexpand { "0" | "1" }?
+attlist.separator &=
+  [ a:defaultValue = "0" ] attribute xfill { "0" | "1" }?
 attlist.separator &= attribute help { text }?
 label = element label { attlist.label, empty }
 attlist.label &= [ a:defaultValue = "" ] attribute string { text }?
@@ -91,6 +98,9 @@ attlist.group &= [ a:defaultValue = "1" ] attribute colspan { text }?
 attlist.group &=
   [ a:defaultValue = "0" ] attribute yexpand { "0" | "1" }?
 attlist.group &= [ a:defaultValue = "1" ] attribute yfill { "0" | "1" }?
+attlist.group &=
+  [ a:defaultValue = "0" ] attribute xexpand { "0" | "1" }?
+attlist.group &= [ a:defaultValue = "1" ] attribute xfill { "0" | "1" }?
 attlist.group &= [ a:defaultValue = "1" ] attribute rowspan { text }?
 attlist.group &= [ a:defaultValue = "4" ] attribute col { text }?
 attlist.group &= attribute id { text }
diff --git a/trytond/ir/ui/board.rng b/trytond/ir/ui/board.rng
index e00d0a064b..cb65b5356e 100644
--- a/trytond/ir/ui/board.rng
+++ b/trytond/ir/ui/board.rng
@@ -62,6 +62,26 @@
       </attribute>
     </optional>
   </define>
+  <define name="attlist.image" combine="interleave">
+    <optional>
+      <attribute name="xexpand" a:defaultValue="0">
+        <choice>
+          <value>0</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="attlist.image" combine="interleave">
+    <optional>
+      <attribute name="xfill" a:defaultValue="0">
+        <choice>
+          <value>0</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
   <define name="attlist.image" combine="interleave">
     <optional>
       <attribute name="help"/>
@@ -124,6 +144,26 @@
       </attribute>
     </optional>
   </define>
+  <define name="attlist.separator" combine="interleave">
+    <optional>
+      <attribute name="xexpand" a:defaultValue="0">
+        <choice>
+          <value>0</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="attlist.separator" combine="interleave">
+    <optional>
+      <attribute name="xfill" a:defaultValue="0">
+        <choice>
+          <value>0</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
   <define name="attlist.separator" combine="interleave">
     <optional>
       <attribute name="help"/>
@@ -320,6 +360,26 @@
       </attribute>
     </optional>
   </define>
+  <define name="attlist.group" combine="interleave">
+    <optional>
+      <attribute name="xexpand" a:defaultValue="0">
+        <choice>
+          <value>0</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="attlist.group" combine="interleave">
+    <optional>
+      <attribute name="xfill" a:defaultValue="1">
+        <choice>
+          <value>0</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
   <define name="attlist.group" combine="interleave">
     <optional>
       <attribute name="rowspan" a:defaultValue="1"/>
diff --git a/trytond/ir/ui/form.rnc b/trytond/ir/ui/form.rnc
index b47702a002..b20dd5ce0d 100644
--- a/trytond/ir/ui/form.rnc
+++ b/trytond/ir/ui/form.rnc
@@ -133,6 +133,9 @@ attlist.image &= [ a:defaultValue = "1" ] attribute colspan { text }?
 attlist.image &=
   [ a:defaultValue = "0" ] attribute yexpand { "0" | "1" }?
 attlist.image &= [ a:defaultValue = "0" ] attribute yfill { "0" | "1" }?
+attlist.image &=
+  [ a:defaultValue = "0" ] attribute xexpand { "0" | "1" }?
+attlist.image &= [ a:defaultValue = "0" ] attribute xfill { "0" | "1" }?
 attlist.image &= attribute help { text }?
 attlist.image &= attribute states { text }?
 separator = element separator { attlist.separator, empty }
@@ -147,6 +150,10 @@ attlist.separator &=
   [ a:defaultValue = "0" ] attribute yexpand { "0" | "1" }?
 attlist.separator &=
   [ a:defaultValue = "0" ] attribute yfill { "0" | "1" }?
+attlist.separator &=
+  [ a:defaultValue = "0" ] attribute xexpand { "0" | "1" }?
+attlist.separator &=
+  [ a:defaultValue = "0" ] attribute xfill { "0" | "1" }?
 attlist.separator &= attribute help { text }?
 newline = element newline { attlist.newline, empty }
 attlist.newline &= empty
@@ -204,6 +211,9 @@ attlist.group &= [ a:defaultValue = "1" ] attribute colspan { text }?
 attlist.group &=
   [ a:defaultValue = "0" ] attribute yexpand { "0" | "1" }?
 attlist.group &= [ a:defaultValue = "1" ] attribute yfill { "0" | "1" }?
+attlist.group &=
+  [ a:defaultValue = "0" ] attribute xexpand { "0" | "1" }?
+attlist.group &= [ a:defaultValue = "1" ] attribute xfill { "0" | "1" }?
 attlist.group &= [ a:defaultValue = "1" ] attribute rowspan { text }?
 attlist.group &= [ a:defaultValue = "4" ] attribute col { text }?
 attlist.group &= ( attribute name { text } | attribute id { text } )
diff --git a/trytond/ir/ui/form.rng b/trytond/ir/ui/form.rng
index 725df61dd9..1bb7c62bff 100644
--- a/trytond/ir/ui/form.rng
+++ b/trytond/ir/ui/form.rng
@@ -505,6 +505,26 @@
       <attribute name="help"/>
     </optional>
   </define>
+  <define name="attlist.image" combine="interleave">
+    <optional>
+      <attribute name="xexpand" a:defaultValue="0">
+        <choice>
+          <value>0</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="attlist.image" combine="interleave">
+    <optional>
+      <attribute name="xfill" a:defaultValue="0">
+        <choice>
+          <value>0</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
   <define name="attlist.image" combine="interleave">
     <optional>
       <attribute name="states"/>
@@ -562,6 +582,26 @@
       </attribute>
     </optional>
   </define>
+  <define name="attlist.separator" combine="interleave">
+    <optional>
+      <attribute name="xexpand" a:defaultValue="0">
+        <choice>
+          <value>0</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="attlist.separator" combine="interleave">
+    <optional>
+      <attribute name="xfill" a:defaultValue="0">
+        <choice>
+          <value>0</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
   <define name="attlist.separator" combine="interleave">
     <optional>
       <attribute name="help"/>
@@ -738,6 +778,26 @@
       </attribute>
     </optional>
   </define>
+  <define name="attlist.group" combine="interleave">
+    <optional>
+      <attribute name="xexpand" a:defaultValue="0">
+        <choice>
+          <value>0</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
+  <define name="attlist.group" combine="interleave">
+    <optional>
+      <attribute name="xfill" a:defaultValue="1">
+        <choice>
+          <value>0</value>
+          <value>1</value>
+        </choice>
+      </attribute>
+    </optional>
+  </define>
   <define name="attlist.group" combine="interleave">
     <optional>
       <attribute name="rowspan" a:defaultValue="1"/>