diff --git a/buildSrc b/buildSrc
index 55df9ff8ab..55c3e5065f 160000
--- a/buildSrc
+++ b/buildSrc
@@ -1 +1 @@
-Subproject commit 55df9ff8ab275781d5350c5f6579ca0ccfc04bb9
+Subproject commit 55c3e5065f378eaaeae5739ecf078c1f5815845d
diff --git a/docs/src/reference/resources/images/admon/caution.png b/docs/src/reference/resources/images/admon/caution.png
new file mode 100644
index 0000000000..5b7809ca4a
Binary files /dev/null and b/docs/src/reference/resources/images/admon/caution.png differ
diff --git a/docs/src/reference/resources/images/admon/important.png b/docs/src/reference/resources/images/admon/important.png
new file mode 100644
index 0000000000..12c90f607a
Binary files /dev/null and b/docs/src/reference/resources/images/admon/important.png differ
diff --git a/docs/src/reference/resources/images/admon/note.png b/docs/src/reference/resources/images/admon/note.png
new file mode 100644
index 0000000000..d0c3c645ab
Binary files /dev/null and b/docs/src/reference/resources/images/admon/note.png differ
diff --git a/docs/src/reference/resources/images/admon/tip.png b/docs/src/reference/resources/images/admon/tip.png
new file mode 100644
index 0000000000..5c4aab3bb3
Binary files /dev/null and b/docs/src/reference/resources/images/admon/tip.png differ
diff --git a/docs/src/reference/resources/images/admon/warning.png b/docs/src/reference/resources/images/admon/warning.png
new file mode 100644
index 0000000000..1c33db8f34
Binary files /dev/null and b/docs/src/reference/resources/images/admon/warning.png differ
diff --git a/docs/src/reference/resources/xsl/html-custom.xsl b/docs/src/reference/resources/xsl/html-custom.xsl
index 76e6fb0bbe..575267e3c7 100644
--- a/docs/src/reference/resources/xsl/html-custom.xsl
+++ b/docs/src/reference/resources/xsl/html-custom.xsl
@@ -43,7 +43,7 @@
 
 <!-- Activate Graphics -->
 	<xsl:param name="admon.graphics" select="1"/>
-	<xsl:param name="admon.graphics.path">images/</xsl:param>
+	<xsl:param name="admon.graphics.path">images/admon/</xsl:param>
 	<xsl:param name="admon.graphics.extension">.png</xsl:param>
 	<xsl:param name="callout.graphics" select="1" />
 	<xsl:param name="callout.defaultcolumn">120</xsl:param>
diff --git a/docs/src/reference/resources/xsl/html-single-custom.xsl b/docs/src/reference/resources/xsl/html-single-custom.xsl
index 63ccaaff6c..264d9a81f0 100644
--- a/docs/src/reference/resources/xsl/html-single-custom.xsl
+++ b/docs/src/reference/resources/xsl/html-single-custom.xsl
@@ -40,7 +40,7 @@
 
 <!-- Activate Graphics -->
     <xsl:param name="admon.graphics" select="1"/>
-    <xsl:param name="admon.graphics.path">images/</xsl:param>
+    <xsl:param name="admon.graphics.path">images/admon/</xsl:param>
     <xsl:param name="admon.graphics.extension">.png</xsl:param>
     <xsl:param name="callout.graphics" select="1" />
     <xsl:param name="callout.defaultcolumn">120</xsl:param>
diff --git a/docs/src/reference/resources/xsl/pdf-custom.xsl b/docs/src/reference/resources/xsl/pdf-custom.xsl
index 9f7b2c5ff0..fef198b51b 100644
--- a/docs/src/reference/resources/xsl/pdf-custom.xsl
+++ b/docs/src/reference/resources/xsl/pdf-custom.xsl
@@ -28,8 +28,10 @@
     <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/docbook.xsl"/>
     <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/fo/highlight.xsl"/>
 
-    <!-- xsl:param name="draft.watermark.image" select="'images/draft.png'"/ -->
-    <xsl:param name="paper.type" select="'A4'"/>
+<!-- Use nice graphics for admonitions -->
+    <xsl:param name="admon.graphics">'1'</xsl:param>
+    <xsl:param name="admon.graphics.path">images/admon/</xsl:param>
+    <xsl:param name="admon.graphics.extension">.png</xsl:param>
 
 <!-- resize the admon graphics. they're width 36pt by default
      even though the graphics that ship with docbook are 24x24 -->
@@ -38,6 +40,7 @@
       <xsl:text>24pt</xsl:text>
     </xsl:template>
 
+    <xsl:param name="paper.type" select="'A4'"/>
     <xsl:param name="page.margin.top" select="'1cm'"/>
     <xsl:param name="region.before.extent" select="'1cm'"/>
     <xsl:param name="body.margin.top" select="'1.5cm'"/>
@@ -47,9 +50,6 @@
     <xsl:param name="page.margin.bottom" select="'1cm'"/>
     <xsl:param name="title.margin.left" select="'0cm'"/>
 
-    <xsl:param name="page.margin.inner" select="'2cm'"/>
-    <xsl:param name="page.margin.outer" select="'2cm'"/>
-
 <!--###################################################
         Header
     ################################################### -->
@@ -204,7 +204,6 @@
     <xsl:param name="use.extensions">1</xsl:param>
     <xsl:param name="tablecolumns.extension">0</xsl:param>
     <xsl:param name="callout.extensions">1</xsl:param>
-    <xsl:param name="fop1.extensions">1</xsl:param>
 
 <!--###################################################
         Paper & Page Size
@@ -250,7 +249,6 @@
     </xsl:template>
 
 <!-- Sections 1, 2 and 3 titles have a small bump factor and padding -->
-
     <xsl:attribute-set name="section.title.level1.properties">
         <xsl:attribute name="space-before.optimum">0.8em</xsl:attribute>
         <xsl:attribute name="space-before.minimum">0.8em</xsl:attribute>