diff --git a/railties/Rakefile b/railties/Rakefile
index 540bce3741..174c85b59a 100644
--- a/railties/Rakefile
+++ b/railties/Rakefile
@@ -279,7 +279,8 @@ guides.each do |guide_name|
   output = "doc/guides/#{guide_name}/#{guide_name}.html"
   guides_html_files << output
   file output => Dir["doc/guides/#{guide_name}/*.txt"] do
-    sh "mizuho", input, "--template", "manualsonrails", "--multi"
+    sh "mizuho", input, "--template", "manualsonrails", "--multi-page",
+       "--icons-dir", "../icons"
   end
 end
 
diff --git a/railties/doc/guides/icons/README b/railties/doc/guides/icons/README
new file mode 100644
index 0000000000..f12b2a730c
--- /dev/null
+++ b/railties/doc/guides/icons/README
@@ -0,0 +1,5 @@
+Replaced the plain DocBook XSL admonition icons with Jimmac's DocBook
+icons (http://jimmac.musichall.cz/ikony.php3). I dropped transparency
+from the Jimmac icons to get round MS IE and FOP PNG incompatibilies.
+
+Stuart Rackham
diff --git a/railties/doc/guides/icons/callouts/1.png b/railties/doc/guides/icons/callouts/1.png
new file mode 100644
index 0000000000..7d473430b7
Binary files /dev/null and b/railties/doc/guides/icons/callouts/1.png differ
diff --git a/railties/doc/guides/icons/callouts/10.png b/railties/doc/guides/icons/callouts/10.png
new file mode 100644
index 0000000000..997bbc8246
Binary files /dev/null and b/railties/doc/guides/icons/callouts/10.png differ
diff --git a/railties/doc/guides/icons/callouts/11.png b/railties/doc/guides/icons/callouts/11.png
new file mode 100644
index 0000000000..ce47dac3f5
Binary files /dev/null and b/railties/doc/guides/icons/callouts/11.png differ
diff --git a/railties/doc/guides/icons/callouts/12.png b/railties/doc/guides/icons/callouts/12.png
new file mode 100644
index 0000000000..31daf4e2f2
Binary files /dev/null and b/railties/doc/guides/icons/callouts/12.png differ
diff --git a/railties/doc/guides/icons/callouts/13.png b/railties/doc/guides/icons/callouts/13.png
new file mode 100644
index 0000000000..14021a89c2
Binary files /dev/null and b/railties/doc/guides/icons/callouts/13.png differ
diff --git a/railties/doc/guides/icons/callouts/14.png b/railties/doc/guides/icons/callouts/14.png
new file mode 100644
index 0000000000..64014b75fe
Binary files /dev/null and b/railties/doc/guides/icons/callouts/14.png differ
diff --git a/railties/doc/guides/icons/callouts/15.png b/railties/doc/guides/icons/callouts/15.png
new file mode 100644
index 0000000000..0d65765fcf
Binary files /dev/null and b/railties/doc/guides/icons/callouts/15.png differ
diff --git a/railties/doc/guides/icons/callouts/2.png b/railties/doc/guides/icons/callouts/2.png
new file mode 100644
index 0000000000..5d09341b2f
Binary files /dev/null and b/railties/doc/guides/icons/callouts/2.png differ
diff --git a/railties/doc/guides/icons/callouts/3.png b/railties/doc/guides/icons/callouts/3.png
new file mode 100644
index 0000000000..ef7b700471
Binary files /dev/null and b/railties/doc/guides/icons/callouts/3.png differ
diff --git a/railties/doc/guides/icons/callouts/4.png b/railties/doc/guides/icons/callouts/4.png
new file mode 100644
index 0000000000..adb8364eb5
Binary files /dev/null and b/railties/doc/guides/icons/callouts/4.png differ
diff --git a/railties/doc/guides/icons/callouts/5.png b/railties/doc/guides/icons/callouts/5.png
new file mode 100644
index 0000000000..4d7eb46002
Binary files /dev/null and b/railties/doc/guides/icons/callouts/5.png differ
diff --git a/railties/doc/guides/icons/callouts/6.png b/railties/doc/guides/icons/callouts/6.png
new file mode 100644
index 0000000000..0ba694af6c
Binary files /dev/null and b/railties/doc/guides/icons/callouts/6.png differ
diff --git a/railties/doc/guides/icons/callouts/7.png b/railties/doc/guides/icons/callouts/7.png
new file mode 100644
index 0000000000..472e96f8ac
Binary files /dev/null and b/railties/doc/guides/icons/callouts/7.png differ
diff --git a/railties/doc/guides/icons/callouts/8.png b/railties/doc/guides/icons/callouts/8.png
new file mode 100644
index 0000000000..5e60973c21
Binary files /dev/null and b/railties/doc/guides/icons/callouts/8.png differ
diff --git a/railties/doc/guides/icons/callouts/9.png b/railties/doc/guides/icons/callouts/9.png
new file mode 100644
index 0000000000..a0676d26cc
Binary files /dev/null and b/railties/doc/guides/icons/callouts/9.png differ
diff --git a/railties/doc/guides/icons/caution.png b/railties/doc/guides/icons/caution.png
new file mode 100644
index 0000000000..cb9d5ea0df
Binary files /dev/null and b/railties/doc/guides/icons/caution.png differ
diff --git a/railties/doc/guides/icons/example.png b/railties/doc/guides/icons/example.png
new file mode 100644
index 0000000000..bba1c0010d
Binary files /dev/null and b/railties/doc/guides/icons/example.png differ
diff --git a/railties/doc/guides/icons/home.png b/railties/doc/guides/icons/home.png
new file mode 100644
index 0000000000..37a5231bac
Binary files /dev/null and b/railties/doc/guides/icons/home.png differ
diff --git a/railties/doc/guides/icons/important.png b/railties/doc/guides/icons/important.png
new file mode 100644
index 0000000000..1096c23295
Binary files /dev/null and b/railties/doc/guides/icons/important.png differ
diff --git a/railties/doc/guides/icons/next.png b/railties/doc/guides/icons/next.png
new file mode 100644
index 0000000000..64e126bdda
Binary files /dev/null and b/railties/doc/guides/icons/next.png differ
diff --git a/railties/doc/guides/icons/note.png b/railties/doc/guides/icons/note.png
new file mode 100644
index 0000000000..841820f7c4
Binary files /dev/null and b/railties/doc/guides/icons/note.png differ
diff --git a/railties/doc/guides/icons/prev.png b/railties/doc/guides/icons/prev.png
new file mode 100644
index 0000000000..3e8f12fe24
Binary files /dev/null and b/railties/doc/guides/icons/prev.png differ
diff --git a/railties/doc/guides/icons/tip.png b/railties/doc/guides/icons/tip.png
new file mode 100644
index 0000000000..a3a029d898
Binary files /dev/null and b/railties/doc/guides/icons/tip.png differ
diff --git a/railties/doc/guides/icons/up.png b/railties/doc/guides/icons/up.png
new file mode 100644
index 0000000000..2db1ce62fa
Binary files /dev/null and b/railties/doc/guides/icons/up.png differ
diff --git a/railties/doc/guides/icons/warning.png b/railties/doc/guides/icons/warning.png
new file mode 100644
index 0000000000..0b0c419df2
Binary files /dev/null and b/railties/doc/guides/icons/warning.png differ