diff --git a/docs/manual/src/docs/asciidoc/images/palette.odg b/docs/manual/src/docs/asciidoc/images/palette.odg
deleted file mode 100644
index 366f7e2678..0000000000
Binary files a/docs/manual/src/docs/asciidoc/images/palette.odg and /dev/null differ
diff --git a/docs/manual/src/docs/asciidoc/images/palette.otg b/docs/manual/src/docs/asciidoc/images/palette.otg
new file mode 100644
index 0000000000..731b26683c
Binary files /dev/null and b/docs/manual/src/docs/asciidoc/images/palette.otg differ
diff --git a/docs/manual/src/docs/asciidoc/images/servlet/architecture/delegatingfilterproxy.odg b/docs/manual/src/docs/asciidoc/images/servlet/architecture/delegatingfilterproxy.odg
index a4b22680aa..56c4f97bc7 100644
Binary files a/docs/manual/src/docs/asciidoc/images/servlet/architecture/delegatingfilterproxy.odg and b/docs/manual/src/docs/asciidoc/images/servlet/architecture/delegatingfilterproxy.odg differ
diff --git a/docs/manual/src/docs/asciidoc/images/servlet/architecture/delegatingfilterproxy.png b/docs/manual/src/docs/asciidoc/images/servlet/architecture/delegatingfilterproxy.png
index a261d427ab..f2bced79a6 100644
Binary files a/docs/manual/src/docs/asciidoc/images/servlet/architecture/delegatingfilterproxy.png and b/docs/manual/src/docs/asciidoc/images/servlet/architecture/delegatingfilterproxy.png differ
diff --git a/docs/manual/src/docs/asciidoc/images/servlet/architecture/exceptiontranslationfilter.odg b/docs/manual/src/docs/asciidoc/images/servlet/architecture/exceptiontranslationfilter.odg
index 7ea6ae54ec..96cab5823f 100644
Binary files a/docs/manual/src/docs/asciidoc/images/servlet/architecture/exceptiontranslationfilter.odg and b/docs/manual/src/docs/asciidoc/images/servlet/architecture/exceptiontranslationfilter.odg differ
diff --git a/docs/manual/src/docs/asciidoc/images/servlet/architecture/exceptiontranslationfilter.png b/docs/manual/src/docs/asciidoc/images/servlet/architecture/exceptiontranslationfilter.png
index c646d97bbb..33b019629f 100644
Binary files a/docs/manual/src/docs/asciidoc/images/servlet/architecture/exceptiontranslationfilter.png and b/docs/manual/src/docs/asciidoc/images/servlet/architecture/exceptiontranslationfilter.png differ
diff --git a/docs/manual/src/docs/asciidoc/images/servlet/architecture/filterchain.gif b/docs/manual/src/docs/asciidoc/images/servlet/architecture/filterchain.gif
new file mode 100644
index 0000000000..7c82a4fe1e
Binary files /dev/null and b/docs/manual/src/docs/asciidoc/images/servlet/architecture/filterchain.gif differ
diff --git a/docs/manual/src/docs/asciidoc/images/servlet/architecture/filterchain.odg b/docs/manual/src/docs/asciidoc/images/servlet/architecture/filterchain.odg
index b806d8c5d2..20e8dc6651 100644
Binary files a/docs/manual/src/docs/asciidoc/images/servlet/architecture/filterchain.odg and b/docs/manual/src/docs/asciidoc/images/servlet/architecture/filterchain.odg differ
diff --git a/docs/manual/src/docs/asciidoc/images/servlet/architecture/filterchainproxy.odg b/docs/manual/src/docs/asciidoc/images/servlet/architecture/filterchainproxy.odg
index d37eb6e681..7f085fd025 100644
Binary files a/docs/manual/src/docs/asciidoc/images/servlet/architecture/filterchainproxy.odg and b/docs/manual/src/docs/asciidoc/images/servlet/architecture/filterchainproxy.odg differ
diff --git a/docs/manual/src/docs/asciidoc/images/servlet/architecture/filterchainproxy.png b/docs/manual/src/docs/asciidoc/images/servlet/architecture/filterchainproxy.png
index dfc15946fd..225e0ef773 100644
Binary files a/docs/manual/src/docs/asciidoc/images/servlet/architecture/filterchainproxy.png and b/docs/manual/src/docs/asciidoc/images/servlet/architecture/filterchainproxy.png differ
diff --git a/docs/manual/src/docs/asciidoc/images/servlet/architecture/multi-securityfilterchain.odg b/docs/manual/src/docs/asciidoc/images/servlet/architecture/multi-securityfilterchain.odg
index 138b07e803..c0dc6dc40c 100644
Binary files a/docs/manual/src/docs/asciidoc/images/servlet/architecture/multi-securityfilterchain.odg and b/docs/manual/src/docs/asciidoc/images/servlet/architecture/multi-securityfilterchain.odg differ
diff --git a/docs/manual/src/docs/asciidoc/images/servlet/architecture/multi-securityfilterchain.png b/docs/manual/src/docs/asciidoc/images/servlet/architecture/multi-securityfilterchain.png
index a903091dbe..aa5195f1bb 100644
Binary files a/docs/manual/src/docs/asciidoc/images/servlet/architecture/multi-securityfilterchain.png and b/docs/manual/src/docs/asciidoc/images/servlet/architecture/multi-securityfilterchain.png differ
diff --git a/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/abstractauthenticationprocessingfilter.odg b/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/abstractauthenticationprocessingfilter.odg
index d0636add4f..22f74f1364 100644
Binary files a/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/abstractauthenticationprocessingfilter.odg and b/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/abstractauthenticationprocessingfilter.odg differ
diff --git a/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/abstractauthenticationprocessingfilter.png b/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/abstractauthenticationprocessingfilter.png
index 783d5bfc58..0f4a4108b6 100644
Binary files a/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/abstractauthenticationprocessingfilter.png and b/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/abstractauthenticationprocessingfilter.png differ
diff --git a/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/providermanager-parent.odg b/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/providermanager-parent.odg
index 9f42f68249..1b17dc76a5 100644
Binary files a/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/providermanager-parent.odg and b/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/providermanager-parent.odg differ
diff --git a/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/providermanager-parent.png b/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/providermanager-parent.png
index af3d415ff9..2b0d1a5df0 100644
Binary files a/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/providermanager-parent.png and b/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/providermanager-parent.png differ
diff --git a/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/providermanager.odg b/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/providermanager.odg
index 3ebf9fbe4f..c950fd70d0 100644
Binary files a/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/providermanager.odg and b/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/providermanager.odg differ
diff --git a/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/providermanager.png b/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/providermanager.png
index 3f143cde1d..fb486bcb0f 100644
Binary files a/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/providermanager.png and b/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/providermanager.png differ
diff --git a/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/providermanagers-parent.odg b/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/providermanagers-parent.odg
index df298aec5b..786224b0a9 100644
Binary files a/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/providermanagers-parent.odg and b/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/providermanagers-parent.odg differ
diff --git a/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/providermanagers-parent.png b/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/providermanagers-parent.png
index c29c69ac20..10934b5741 100644
Binary files a/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/providermanagers-parent.png and b/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/providermanagers-parent.png differ
diff --git a/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/securitycontextholder.odg b/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/securitycontextholder.odg
index 9591831954..64f56a05d6 100644
Binary files a/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/securitycontextholder.odg and b/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/securitycontextholder.odg differ
diff --git a/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/securitycontextholder.png b/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/securitycontextholder.png
index a3088e595d..9eaa5eb602 100644
Binary files a/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/securitycontextholder.png and b/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/securitycontextholder.png differ
diff --git a/docs/manual/src/docs/asciidoc/images/servlet/authorization/filtersecurityinterceptor.odg b/docs/manual/src/docs/asciidoc/images/servlet/authorization/filtersecurityinterceptor.odg
index 88fbcdb7d2..c1a9e6fac1 100644
Binary files a/docs/manual/src/docs/asciidoc/images/servlet/authorization/filtersecurityinterceptor.odg and b/docs/manual/src/docs/asciidoc/images/servlet/authorization/filtersecurityinterceptor.odg differ
diff --git a/docs/manual/src/docs/asciidoc/images/servlet/authorization/filtersecurityinterceptor.png b/docs/manual/src/docs/asciidoc/images/servlet/authorization/filtersecurityinterceptor.png
index 61241bfedb..20f17f714e 100644
Binary files a/docs/manual/src/docs/asciidoc/images/servlet/authorization/filtersecurityinterceptor.png and b/docs/manual/src/docs/asciidoc/images/servlet/authorization/filtersecurityinterceptor.png differ