diff --git a/clutter/clutter-flow-layout.c b/clutter/clutter-flow-layout.c
index dd5919a0f..38f0fe669 100644
--- a/clutter/clutter-flow-layout.c
+++ b/clutter/clutter-flow-layout.c
@@ -48,20 +48,12 @@
  *   in both columns and rows.</para></listitem>
  * </itemizedlist>
  *
- * <figure id="flow-layout-horizontal">
+ * <figure id="flow-layout-image">
  *   <title>Horizontal flow layout</title>
  *   <para>The image shows a #ClutterFlowLayout with the
  *   #ClutterFlowLayout:orientation propert set to
  *   %CLUTTER_FLOW_HORIZONTAL.</para>
- *   <graphic fileref="flow-layout-horizontal.png" format="PNG"/>
- * </figure>
- *
- * <figure id="flow-layout-vertical">
- *   <title>Vertical flow layout</title>
- *   <para>The image shows a #ClutterFlowLayout with the
- *   #ClutterFlowLayout:orientation propert set to
- *   %CLUTTER_FLOW_VERTICAL.</para>
- *   <graphic fileref="flow-layout-vertical.png" format="PNG"/>
+ *   <graphic fileref="flow-layout.png" format="PNG"/>
  * </figure>
  *
  * #ClutterFlowLayout is available since Clutter 1.2
diff --git a/clutter/clutter-table-layout.c b/clutter/clutter-table-layout.c
index 68cccf511..0062a03c6 100644
--- a/clutter/clutter-table-layout.c
+++ b/clutter/clutter-table-layout.c
@@ -67,6 +67,12 @@
  * #ClutterTableLayout:easing-mode and #ClutterTableLayout:easing-duration
  * properties and their accessor functions.
  *
+ * <figure id="table-layout-image">
+ *   <title>Table layout</title>
+ *   <para>The image shows a #ClutterTableLayout.</para>
+ *   <graphic fileref="table-layout.png" format="PNG"/>
+ * </figure>
+ *
  * #ClutterTableLayout is available since Clutter 1.4
  */
 
diff --git a/doc/reference/clutter/Makefile.am b/doc/reference/clutter/Makefile.am
index 321913786..0275ba5d3 100644
--- a/doc/reference/clutter/Makefile.am
+++ b/doc/reference/clutter/Makefile.am
@@ -124,10 +124,10 @@ HTML_IMAGES = \
 	constraints-example.png \
         easing-modes.png \
 	event-flow.png \
-	flow-layout-horizontal.png \
-	flow-layout-vertical.png \
+	flow-layout.png \
 	path-alpha-func.png \
-	offscreen-redirect.png
+	offscreen-redirect.png \
+	table-layout.png
 
 # SVG used to generate the images above
 SVG_IMAGES = \
diff --git a/doc/reference/clutter/bin-layout.png b/doc/reference/clutter/bin-layout.png
index 87e9b9948..aeed4d6a0 100644
Binary files a/doc/reference/clutter/bin-layout.png and b/doc/reference/clutter/bin-layout.png differ
diff --git a/doc/reference/clutter/box-layout.png b/doc/reference/clutter/box-layout.png
index 729d2386a..6e50ef19b 100644
Binary files a/doc/reference/clutter/box-layout.png and b/doc/reference/clutter/box-layout.png differ
diff --git a/doc/reference/clutter/flow-layout-horizontal.png b/doc/reference/clutter/flow-layout-horizontal.png
deleted file mode 100644
index 30df8c9cb..000000000
Binary files a/doc/reference/clutter/flow-layout-horizontal.png and /dev/null differ
diff --git a/doc/reference/clutter/flow-layout-vertical.png b/doc/reference/clutter/flow-layout-vertical.png
deleted file mode 100644
index 76c3df86d..000000000
Binary files a/doc/reference/clutter/flow-layout-vertical.png and /dev/null differ
diff --git a/doc/reference/clutter/flow-layout.png b/doc/reference/clutter/flow-layout.png
new file mode 100644
index 000000000..809ae918a
Binary files /dev/null and b/doc/reference/clutter/flow-layout.png differ
diff --git a/doc/reference/clutter/table-layout.png b/doc/reference/clutter/table-layout.png
new file mode 100644
index 000000000..b0b361743
Binary files /dev/null and b/doc/reference/clutter/table-layout.png differ