diff --git a/docs/manual/src/docbook/authorization-common.xml b/docs/manual/src/docbook/authorization-common.xml
index 2b6cafb2aa..2a1c8e79a5 100644
--- a/docs/manual/src/docbook/authorization-common.xml
+++ b/docs/manual/src/docbook/authorization-common.xml
@@ -93,14 +93,9 @@
       <figure xml:id="authz-access-voting">
         <title>Voting Decision Manager</title>
         <mediaobject>
-          <!--
-      <imageobject role="fo">
-        <imagedata align="center" fileref="resources/images/AccessDecisionVoting.gif" format="GIF"/>
-      </imageobject>
--->
           <imageobject>
-            <imagedata align="center" scalefit="1" fileref="images/AccessDecisionVoting.gif"
-              format="GIF"/>
+            <imagedata align="center" fileref="images/access-decision-voting.png"
+              format="PNG" scale="75"/>
           </imageobject>
         </mediaobject>
       </figure>
@@ -204,8 +199,7 @@ boolean supports(Class clazz);
         <title>After Invocation Implementation</title>
         <mediaobject>
           <imageobject>
-            <imagedata align="center" scalefit="1" fileref="images/AfterInvocation.gif" format="GIF"
-            />
+            <imagedata align="center" fileref="images/after-invocation.png" format="PNG" scale="75"/>
           </imageobject>
         </mediaobject>
       </figure></para>
diff --git a/docs/manual/src/docbook/images/AccessDecisionVoting.gif b/docs/manual/src/docbook/images/AccessDecisionVoting.gif
deleted file mode 100644
index 5e95bf9f96..0000000000
Binary files a/docs/manual/src/docbook/images/AccessDecisionVoting.gif and /dev/null differ
diff --git a/docs/manual/src/docbook/images/AfterInvocation.gif b/docs/manual/src/docbook/images/AfterInvocation.gif
deleted file mode 100644
index 4a27abd650..0000000000
Binary files a/docs/manual/src/docbook/images/AfterInvocation.gif and /dev/null differ
diff --git a/docs/manual/src/docbook/images/access-decision-voting.graffle b/docs/manual/src/docbook/images/access-decision-voting.graffle
new file mode 100644
index 0000000000..99fbbe7be7
Binary files /dev/null and b/docs/manual/src/docbook/images/access-decision-voting.graffle differ
diff --git a/docs/manual/src/docbook/images/access-decision-voting.png b/docs/manual/src/docbook/images/access-decision-voting.png
new file mode 100644
index 0000000000..d9d78dd016
Binary files /dev/null and b/docs/manual/src/docbook/images/access-decision-voting.png differ
diff --git a/docs/manual/src/docbook/images/after-invocation.graffle b/docs/manual/src/docbook/images/after-invocation.graffle
new file mode 100644
index 0000000000..2a303e02aa
Binary files /dev/null and b/docs/manual/src/docbook/images/after-invocation.graffle differ
diff --git a/docs/manual/src/docbook/images/after-invocation.png b/docs/manual/src/docbook/images/after-invocation.png
new file mode 100644
index 0000000000..22c3c1ff45
Binary files /dev/null and b/docs/manual/src/docbook/images/after-invocation.png differ
diff --git a/docs/manual/src/docbook/technical-overview.xml b/docs/manual/src/docbook/technical-overview.xml
index 36491dd3ac..0b733fcf5f 100644
--- a/docs/manual/src/docbook/technical-overview.xml
+++ b/docs/manual/src/docbook/technical-overview.xml
@@ -554,7 +554,7 @@ Successfully authenticated. Security context contains: \
           in <xref linkend="abstract-security-interceptor"/>. <figure
             xml:id="abstract-security-interceptor"><title>Security interceptors and the
                 <quote>secure object</quote> model</title><mediaobject><imageobject>
-                <imagedata align="center" fileref="images/security-interception.png" format="PNG"/>
+                <imagedata align="center" fileref="images/security-interception.png" format="PNG" scale="75"/>
               </imageobject></mediaobject></figure></para>
       </section>
       <section>
diff --git a/docs/manual/src/xsl/html-custom.xsl b/docs/manual/src/xsl/html-custom.xsl
index 3a6f626890..abfc5e580d 100644
--- a/docs/manual/src/xsl/html-custom.xsl
+++ b/docs/manual/src/xsl/html-custom.xsl
@@ -30,6 +30,9 @@
 	<xsl:param name="chunk.section.depth">'5'</xsl:param>
 	<xsl:param name="use.id.as.filename">'1'</xsl:param>
 
+	<!-- Only use scaling in FO -->
+	<xsl:param name="ignore.image.scaling">1</xsl:param>
+
 	<!-- Use code syntax highlighting -->
 	<xsl:param name="highlight.source">1</xsl:param>