diff --git a/src/reference/docbook/aop.xml b/src/reference/docbook/aop.xml
index c85432caab32ee378407cb272b2291146a6d4605..f8c01ab352c58816fccd938941bb91d71597e383 100644
--- a/src/reference/docbook/aop.xml
+++ b/src/reference/docbook/aop.xml
@@ -2657,16 +2657,10 @@ public @interface Idempotent {
       be seen below.</para>
 
       <para><mediaobject>
-          <imageobject role="fo">
+          <imageobject>
             <imagedata align="center"
                        fileref="images/aop-proxy-plain-pojo-call.png"
-                       format="PNG" />
-          </imageobject>
-
-          <imageobject role="html">
-            <imagedata align="center"
-                       fileref="images/aop-proxy-plain-pojo-call.png"
-                       format="PNG" />
+                       format="PNG" width="400"/>
           </imageobject>
         </mediaobject></para>
 
@@ -2685,14 +2679,9 @@ public @interface Idempotent {
       a proxy. Consider the following diagram and code snippet.</para>
 
       <para><mediaobject>
-          <imageobject role="fo">
-            <imagedata align="center" fileref="images/aop-proxy-call.png"
-                       format="PNG" />
-          </imageobject>
-
-          <imageobject role="html">
+          <imageobject>
             <imagedata align="center" fileref="images/aop-proxy-call.png"
-                       format="PNG" />
+                       format="PNG" width="400" />
           </imageobject>
         </mediaobject></para>
 
diff --git a/src/reference/docbook/beans-scopes.xml b/src/reference/docbook/beans-scopes.xml
index abba10043f605683b693b00c3bdd827e8180ad75..3b1c05dbcd629e6b47c14ed0e7dc5f735e9485dc 100644
--- a/src/reference/docbook/beans-scopes.xml
+++ b/src/reference/docbook/beans-scopes.xml
@@ -121,13 +121,8 @@
       bean return the cached object.</para>
 
     <para><mediaobject>
-      <imageobject role="fo">
-        <imagedata align="center" fileref="images/singleton.png" format="PNG"
-            width="400"/>
-      </imageobject>
-
-      <imageobject role="html">
-        <imagedata align="center" fileref="images/singleton.png" format="PNG"/>
+      <imageobject>
+        <imagedata align="center" fileref="images/singleton.png" format="PNG" width="400" />
       </imageobject>
       </mediaobject></para>
 
@@ -167,13 +162,8 @@
       diagram.</emphasis><!--First it says diagram illustrates scope, but then says it's not typical of a prototype scope. Why not use realistic one? --></para>
 
     <para><mediaobject>
-      <imageobject role="fo">
-        <imagedata align="center" fileref="images/prototype.png" format="PNG"
-            width="400" />
-      </imageobject>
-
-      <imageobject role="html">
-        <imagedata align="center" fileref="images/prototype.png" format="PNG"/>
+      <imageobject>
+        <imagedata align="center" fileref="images/prototype.png" format="PNG" width="400"/>
       </imageobject>
       </mediaobject></para>
 
diff --git a/src/reference/docbook/beans.xml b/src/reference/docbook/beans.xml
index 05f32bd57ce83f421c7e8cf2cfe689b2786f22f3..d35606e0085e12f06432da7b11cc946a4acd308f 100644
--- a/src/reference/docbook/beans.xml
+++ b/src/reference/docbook/beans.xml
@@ -112,8 +112,7 @@ The footnote should x-ref to first section in that chapter but I can't find the
 
     <para><mediaobject>
       <imageobject>
-        <imagedata align="center" fileref="images/container-magic.png"
-          format="PNG" width="400" />
+        <imagedata align="center" fileref="images/container-magic.png" format="PNG" width="250" />
       </imageobject>
 
       <caption><para>The Spring IoC container</para></caption>
diff --git a/src/reference/docbook/dao.xml b/src/reference/docbook/dao.xml
index 12d0c487afc3bfe9f5ea59021fda66229efc212d..98fe5c226cf6784a7c92c9ea2c80e67cb77d4e2e 100644
--- a/src/reference/docbook/dao.xml
+++ b/src/reference/docbook/dao.xml
@@ -63,14 +63,8 @@
     hierarchy.)</para>
 
     <mediaobject>
-      <imageobject role="fo">
-        <imagedata align="center" fileref="images/DataAccessException.gif"
-            format="PNG" width="400"/>
-      </imageobject>
-
-      <imageobject role="html">
-        <imagedata align="center" fileref="images/DataAccessException.gif"
-            format="PNG" width="400"/>
+      <imageobject>
+        <imagedata align="center" fileref="images/DataAccessException.gif" format="PNG" width="400" />
       </imageobject>
     </mediaobject>
   </section>
diff --git a/src/reference/docbook/mvc.xml b/src/reference/docbook/mvc.xml
index 37d0a27c4af1b8954ccd9cff40c6ac60ef1a3ef2..9fe2f3269dfe45d9a3dc8a55151987a4c256bcfe 100644
--- a/src/reference/docbook/mvc.xml
+++ b/src/reference/docbook/mvc.xml
@@ -235,13 +235,8 @@
     Spring Web MVC shares with many other leading web frameworks).</para>
 
     <para><mediaobject>
-        <imageobject role="fo">
-          <imagedata align="center" fileref="images/mvc.png" format="PNG"
-              width="400" />
-        </imageobject>
-
-        <imageobject role="html">
-          <imagedata align="center" fileref="images/mvc.png" format="PNG" />
+        <imageobject>
+          <imagedata align="center" fileref="images/mvc.png" format="PNG" width="400"/>
         </imageobject>
 
         <caption><para>The request processing workflow in Spring Web MVC (high
@@ -319,14 +314,8 @@
     new scope-specific beans local to a given Servlet instance.</para>
 
     <para><mediaobject>
-        <imageobject role="fo">
-          <imagedata align="center" fileref="images/mvc-contexts.gif"
-                     format="GIF" width="400" />
-        </imageobject>
-
-        <imageobject role="html">
-          <imagedata align="center" fileref="images/mvc-contexts.gif"
-                     format="GIF" />
+        <imageobject>
+          <imagedata align="center" fileref="images/mvc-contexts.gif" format="GIF" width="400" />
         </imageobject>
 
         <caption>Context hierarchy in Spring Web MVC</caption>
diff --git a/src/reference/docbook/overview.xml b/src/reference/docbook/overview.xml
index d01981d5e7414ab37383abb9b22f3810efec40f7..38f0f53f9258316fc6f747bd5d94f7611f017cab 100644
--- a/src/reference/docbook/overview.xml
+++ b/src/reference/docbook/overview.xml
@@ -99,14 +99,8 @@ TR: This section doesn't read well and I think we should try to rewrite it.-->Nu
     Instrumentation, and Test, as shown in the following diagram.</para>
 
     <para><mediaobject>
-        <imageobject role="fo">
-          <imagedata align="left" fileref="images/spring-overview.png"
-                     format="PNG" width="400" />
-        </imageobject>
-
-        <imageobject role="html">
-          <imagedata align="center" fileref="images/spring-overview.png"
-                     format="PNG" />
+        <imageobject>
+          <imagedata align="center" fileref="images/spring-overview.png" format="PNG" width="400" />
         </imageobject>
 
         <caption><para>Overview of the Spring Framework</para></caption>
@@ -261,14 +255,8 @@ TR: OK. Added to diagram.--></para>
     web framework integration.</para>
 
     <para><mediaobject>
-        <imageobject role="fo">
-          <imagedata align="center" fileref="images/overview-full.png"
-                     format="PNG" width="400" />
-        </imageobject>
-
-        <imageobject role="html">
-          <imagedata align="center" fileref="images/overview-full.png"
-                     format="PNG" />
+        <imageobject>
+          <imagedata align="center" fileref="images/overview-full.png" format="PNG" width="400" />
         </imageobject>
 
         <caption><para>Typical full-fledged Spring web
@@ -291,17 +279,12 @@ TR: OK. Added to diagram.--></para>
     that transform HTTP parameters to values for your domain model.</para>
 
     <para><mediaobject>
-        <imageobject role="fo">
+        <imageobject>
           <imagedata align="center"
                      fileref="images/overview-thirdparty-web.png" format="PNG"
                      width="400"/>
         </imageobject>
 
-        <imageobject role="html">
-          <imagedata align="center"
-                     fileref="images/overview-thirdparty-web.png" format="PNG" />
-        </imageobject>
-
         <caption><para>Spring middle-tier using a third-party web
         framework</para></caption>
       </mediaobject></para>
@@ -318,16 +301,10 @@ TR: OK. Added to diagram.--></para>
     layer.</para>
 
     <para><mediaobject>
-        <imageobject role="fo">
+        <imageobject>
           <imagedata align="center" fileref="images/overview-remoting.png"
                      format="PNG" width="400" />
         </imageobject>
-
-        <imageobject role="html">
-          <imagedata align="center" fileref="images/overview-remoting.png"
-                     format="PNG" />
-        </imageobject>
-
         <caption><para>Remoting usage scenario</para></caption>
       </mediaobject></para>
 
@@ -338,16 +315,10 @@ TR: OK. Added to diagram.--></para>
     difficult.</para>
 
     <para><mediaobject>
-        <imageobject role="fo">
+        <imageobject>
           <imagedata align="center" fileref="images/overview-ejb.png"
                      format="PNG" width="400" />
         </imageobject>
-
-        <imageobject role="html">
-          <imagedata align="center" fileref="images/overview-ejb.png"
-                     format="PNG" />
-        </imageobject>
-
         <caption><para>EJBs - Wrapping existing POJOs</para></caption>
       </mediaobject></para>
 
diff --git a/src/reference/docbook/oxm.xml b/src/reference/docbook/oxm.xml
index 04526df4fab56df6fb8ea80eeb2d6ee15f1bcd67..7e6be7536e1647d0d19f210d4fcca2dfb28ff42a 100644
--- a/src/reference/docbook/oxm.xml
+++ b/src/reference/docbook/oxm.xml
@@ -189,26 +189,11 @@ public interface Unmarshaller {
             <para>
                 The O/X Mapping exception hierarchy is shown in the following figure:
                 <mediaobject>
-                    <imageobject role="fo">
+                    <imageobject>
                       <imagedata align="center" fileref="images/oxm-exceptions.png"
                           format="PNG" width="400"/>
                     </imageobject>
-                    <caption>
-                        <para>
-                            O/X Mapping exception hierarchy
-                        </para>
-                    </caption>
-                </mediaobject>
-                <mediaobject>
-                    <imageobject role="html">
-                      <imagedata align="center" fileref="images/oxm-exceptions.png"
-                          format="PNG" width="400"/>
-                    </imageobject>
-                    <caption>
-                        <para>
-                            O/X Mapping exception hierarchy
-                        </para>
-                    </caption>
+                    <caption>O/X Mapping exception hierarchy</caption>
                 </mediaobject>
             </para>
         </section>
diff --git a/src/reference/docbook/transaction.xml b/src/reference/docbook/transaction.xml
index 9ed2f71825c3474a2e428c268fdf883c00421746..17413b0bcf5aa75d40ad15a3b90f58f5ba001218 100644
--- a/src/reference/docbook/transaction.xml
+++ b/src/reference/docbook/transaction.xml
@@ -721,14 +721,10 @@ would be rolled back, not necessarily following the EJB rules-->
 TR: OK AS IS. images don't show up in the editor, but they do show up in the generated docs-->
 
       <para><mediaobject>
-          <imageobject role="fo">
+          <imageobject>
             <imagedata align="center" fileref="images/tx.png" format="PNG"
                 width="400"/>
           </imageobject>
-
-          <imageobject role="html">
-            <imagedata align="center" fileref="images/tx.png" format="PNG" />
-          </imageobject>
         </mediaobject></para>
     </section>
 
@@ -1869,17 +1865,11 @@ TR: REVISED, PLS REVIEW - changed it back; it's not just settings, the section d
         <title>Required</title>
 
         <para><mediaobject>
-            <imageobject role="fo">
-              <imagedata align="center" fileref="images/tx_prop_required.png"
-                  format="PNG" width="400"/>
-            </imageobject>
-
-            <imageobject role="html">
+            <imageobject>
               <imagedata align="center" fileref="images/tx_prop_required.png"
                   format="PNG" width="400"/>
             </imageobject>
-
-              <caption><para>PROPAGATION_REQUIRED</para></caption>
+            <caption>PROPAGATION_REQUIRED</caption>
             </mediaobject></para>
 
         <para>When the propagation setting is
@@ -1916,7 +1906,7 @@ TR: REVISED, PLS REVIEW - changed it back; it's not just settings, the section d
             <imageobject>
               <imagedata align="center"
                          fileref="images/tx_prop_requires_new.png"
-                         format="PNG" />
+                         format="PNG" width="400" />
             </imageobject>
 
             <caption><para>PROPAGATION_REQUIRES_NEW</para></caption>