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 8b0ea34296..a4b22680aa 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 1478c8e02e..a261d427ab 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
new file mode 100644
index 0000000000..7ea6ae54ec
Binary files /dev/null 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
new file mode 100644
index 0000000000..c646d97bbb
Binary files /dev/null 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.odg b/docs/manual/src/docs/asciidoc/images/servlet/architecture/filterchain.odg
index 10b599eb52..b806d8c5d2 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/filterchain.png b/docs/manual/src/docs/asciidoc/images/servlet/architecture/filterchain.png
index 72c9b7fc17..f4c307f80b 100644
Binary files a/docs/manual/src/docs/asciidoc/images/servlet/architecture/filterchain.png and b/docs/manual/src/docs/asciidoc/images/servlet/architecture/filterchain.png 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 956b74ec19..d37eb6e681 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 490a14490e..dfc15946fd 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 f78a09e663..138b07e803 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 cd6004c42d..a903091dbe 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
new file mode 100644
index 0000000000..d0636add4f
Binary files /dev/null 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
new file mode 100644
index 0000000000..783d5bfc58
Binary files /dev/null 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/securitycontextholder.odg b/docs/manual/src/docs/asciidoc/images/servlet/authentication/architecture/securitycontextholder.odg
new file mode 100644
index 0000000000..9591831954
Binary files /dev/null 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
new file mode 100644
index 0000000000..a3088e595d
Binary files /dev/null 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/architecture/filtersecurityinterceptor.odg b/docs/manual/src/docs/asciidoc/images/servlet/authorization/architecture/filtersecurityinterceptor.odg
new file mode 100644
index 0000000000..88fbcdb7d2
Binary files /dev/null and b/docs/manual/src/docs/asciidoc/images/servlet/authorization/architecture/filtersecurityinterceptor.odg differ
diff --git a/docs/manual/src/docs/asciidoc/images/servlet/authorization/architecture/filtersecurityinterceptor.png b/docs/manual/src/docs/asciidoc/images/servlet/authorization/architecture/filtersecurityinterceptor.png
new file mode 100644
index 0000000000..61241bfedb
Binary files /dev/null and b/docs/manual/src/docs/asciidoc/images/servlet/authorization/architecture/filtersecurityinterceptor.png differ