diff --git a/docs/src/reference/docbook/overview.xml b/docs/src/reference/docbook/overview.xml
index 6241073c9f..77cb7fd9ef 100644
--- a/docs/src/reference/docbook/overview.xml
+++ b/docs/src/reference/docbook/overview.xml
@@ -106,11 +106,10 @@
store any arbitrary key-value pairs in the headers.
-
+
-
+
@@ -124,11 +123,10 @@
messaging components, and also provides a convenient point for interception and monitoring of Messages.
-
+
-
+
A Message Channel may follow either Point-to-Point or Publish/Subscribe semantics. With a Point-to-Point
@@ -225,11 +223,10 @@
proactive alternative to the reactive Message Filters used by multiple subscribers as described above.
-
+
-
+
@@ -277,11 +274,10 @@
Message's "return address" if available.
-
+
-
+
A request-reply "Service Activator" endpoint connects a target object's method to input and output
@@ -302,21 +298,19 @@
chapters.
-
+
-
+
An inbound "Channel Adapter" endpoint connects a source system to a MessageChannel.
-
+
-
+
An outbound "Channel Adapter" endpoint connects a MessageChannel to a target system.
diff --git a/docs/src/reference/docbook/samples.xml b/docs/src/reference/docbook/samples.xml
index 17ec275990..6f83b59497 100644
--- a/docs/src/reference/docbook/samples.xml
+++ b/docs/src/reference/docbook/samples.xml
@@ -156,8 +156,7 @@ That includes Samples, so if you can't find what you are looking for let us know
-
+
@@ -235,11 +234,10 @@ That includes Samples, so if you can't find what you are looking for let us know
Messaging Gateway
-
+
-
+
@@ -285,8 +283,7 @@ That includes Samples, so if you can't find what you are looking for let us know
<chain> element.
-
+
@@ -301,11 +298,10 @@ That includes Samples, so if you can't find what you are looking for let us know
Message Router
-
+
-
+
@@ -324,11 +320,10 @@ That includes Samples, so if you can't find what you are looking for let us know
Message Aggregator
-
+
-
+
@@ -396,8 +391,7 @@ That includes Samples, so if you can't find what you are looking for let us know
-
+
diff --git a/docs/src/reference/resources/images/bank-router.jpg b/docs/src/reference/resources/images/bank-router.jpg
new file mode 100644
index 0000000000..18ad524328
Binary files /dev/null and b/docs/src/reference/resources/images/bank-router.jpg differ
diff --git a/docs/src/reference/resources/images/cafe-demo.png b/docs/src/reference/resources/images/cafe-demo.png
deleted file mode 100644
index e97316d5a2..0000000000
Binary files a/docs/src/reference/resources/images/cafe-demo.png and /dev/null differ
diff --git a/docs/src/reference/resources/images/channel.jpg b/docs/src/reference/resources/images/channel.jpg
new file mode 100644
index 0000000000..3d8117da04
Binary files /dev/null and b/docs/src/reference/resources/images/channel.jpg differ
diff --git a/docs/src/reference/resources/images/channel.png b/docs/src/reference/resources/images/channel.png
deleted file mode 100644
index 25e3458dca..0000000000
Binary files a/docs/src/reference/resources/images/channel.png and /dev/null differ
diff --git a/docs/src/reference/resources/images/gateway.jpg b/docs/src/reference/resources/images/gateway.jpg
new file mode 100644
index 0000000000..8849e926fa
Binary files /dev/null and b/docs/src/reference/resources/images/gateway.jpg differ
diff --git a/docs/src/reference/resources/images/handler-endpoint.jpg b/docs/src/reference/resources/images/handler-endpoint.jpg
new file mode 100644
index 0000000000..3da17c845e
Binary files /dev/null and b/docs/src/reference/resources/images/handler-endpoint.jpg differ
diff --git a/docs/src/reference/resources/images/handler-endpoint.png b/docs/src/reference/resources/images/handler-endpoint.png
deleted file mode 100644
index 8a7adfe50c..0000000000
Binary files a/docs/src/reference/resources/images/handler-endpoint.png and /dev/null differ
diff --git a/docs/src/reference/resources/images/handler.png b/docs/src/reference/resources/images/handler.png
deleted file mode 100644
index f1398d5d36..0000000000
Binary files a/docs/src/reference/resources/images/handler.png and /dev/null differ
diff --git a/docs/src/reference/resources/images/important.jpg b/docs/src/reference/resources/images/important.jpg
new file mode 100644
index 0000000000..265679ed0e
Binary files /dev/null and b/docs/src/reference/resources/images/important.jpg differ
diff --git a/docs/src/reference/resources/images/important.png b/docs/src/reference/resources/images/important.png
deleted file mode 100644
index 12c90f607a..0000000000
Binary files a/docs/src/reference/resources/images/important.png and /dev/null differ
diff --git a/docs/src/reference/resources/images/message-bus.png b/docs/src/reference/resources/images/message-bus.png
deleted file mode 100644
index f7b72f5943..0000000000
Binary files a/docs/src/reference/resources/images/message-bus.png and /dev/null differ
diff --git a/docs/src/reference/resources/images/message.jpg b/docs/src/reference/resources/images/message.jpg
new file mode 100644
index 0000000000..af983dd7fd
Binary files /dev/null and b/docs/src/reference/resources/images/message.jpg differ
diff --git a/docs/src/reference/resources/images/message.png b/docs/src/reference/resources/images/message.png
deleted file mode 100644
index 8c08501d80..0000000000
Binary files a/docs/src/reference/resources/images/message.png and /dev/null differ
diff --git a/docs/src/reference/resources/images/note-spr.jpg b/docs/src/reference/resources/images/note-spr.jpg
new file mode 100644
index 0000000000..5a4e5cb189
Binary files /dev/null and b/docs/src/reference/resources/images/note-spr.jpg differ
diff --git a/docs/src/reference/resources/images/note.jpg b/docs/src/reference/resources/images/note.jpg
new file mode 100644
index 0000000000..154538e3be
Binary files /dev/null and b/docs/src/reference/resources/images/note.jpg differ
diff --git a/docs/src/reference/resources/images/note.png b/docs/src/reference/resources/images/note.png
deleted file mode 100644
index ad57f6f72e..0000000000
Binary files a/docs/src/reference/resources/images/note.png and /dev/null differ
diff --git a/docs/src/reference/resources/images/quotes-aggregator.jpg b/docs/src/reference/resources/images/quotes-aggregator.jpg
new file mode 100644
index 0000000000..a3d78bdfc3
Binary files /dev/null and b/docs/src/reference/resources/images/quotes-aggregator.jpg differ
diff --git a/docs/src/reference/resources/images/router.jpg b/docs/src/reference/resources/images/router.jpg
new file mode 100644
index 0000000000..05ca4cba83
Binary files /dev/null and b/docs/src/reference/resources/images/router.jpg differ
diff --git a/docs/src/reference/resources/images/source-endpoint.jpg b/docs/src/reference/resources/images/source-endpoint.jpg
new file mode 100644
index 0000000000..f1b19a38a4
Binary files /dev/null and b/docs/src/reference/resources/images/source-endpoint.jpg differ
diff --git a/docs/src/reference/resources/images/source-endpoint.png b/docs/src/reference/resources/images/source-endpoint.png
deleted file mode 100644
index 4fa95e0198..0000000000
Binary files a/docs/src/reference/resources/images/source-endpoint.png and /dev/null differ
diff --git a/docs/src/reference/resources/images/source.png b/docs/src/reference/resources/images/source.png
deleted file mode 100644
index bec59cf7b3..0000000000
Binary files a/docs/src/reference/resources/images/source.png and /dev/null differ
diff --git a/docs/src/reference/resources/images/target-endpoint.jpg b/docs/src/reference/resources/images/target-endpoint.jpg
new file mode 100644
index 0000000000..766a22d4bd
Binary files /dev/null and b/docs/src/reference/resources/images/target-endpoint.jpg differ
diff --git a/docs/src/reference/resources/images/target-endpoint.png b/docs/src/reference/resources/images/target-endpoint.png
deleted file mode 100644
index dd4b5787d9..0000000000
Binary files a/docs/src/reference/resources/images/target-endpoint.png and /dev/null differ
diff --git a/docs/src/reference/resources/images/target.png b/docs/src/reference/resources/images/target.png
deleted file mode 100644
index 80362dac21..0000000000
Binary files a/docs/src/reference/resources/images/target.png and /dev/null differ
diff --git a/docs/src/reference/resources/images/tip.png b/docs/src/reference/resources/images/tip.png
deleted file mode 100644
index 5c4aab3bb3..0000000000
Binary files a/docs/src/reference/resources/images/tip.png and /dev/null differ
diff --git a/docs/src/reference/resources/images/xdev-spring_logo.jpg b/docs/src/reference/resources/images/xdev-spring_logo.jpg
deleted file mode 100644
index 622962ee3c..0000000000
Binary files a/docs/src/reference/resources/images/xdev-spring_logo.jpg and /dev/null differ