diff --git a/_images/components/messenger/overview.png b/_images/components/messenger/overview.png
deleted file mode 100644
index 074255b4667..00000000000
Binary files a/_images/components/messenger/overview.png and /dev/null differ
diff --git a/_images/components/messenger/overview.svg b/_images/components/messenger/overview.svg
new file mode 100644
index 00000000000..94737e7a6da
--- /dev/null
+++ b/_images/components/messenger/overview.svg
@@ -0,0 +1 @@
+
diff --git a/_images/components/serializer/serializer_workflow.png b/_images/components/serializer/serializer_workflow.png
deleted file mode 100644
index 3e1944e6cec..00000000000
Binary files a/_images/components/serializer/serializer_workflow.png and /dev/null differ
diff --git a/_images/components/serializer/serializer_workflow.svg b/_images/components/serializer/serializer_workflow.svg
new file mode 100644
index 00000000000..f3906506878
--- /dev/null
+++ b/_images/components/serializer/serializer_workflow.svg
@@ -0,0 +1 @@
+
diff --git a/_images/http/request-flow.png b/_images/http/request-flow.png
deleted file mode 100644
index cbf4019307b..00000000000
Binary files a/_images/http/request-flow.png and /dev/null differ
diff --git a/_images/http/request-flow.svg b/_images/http/request-flow.svg
new file mode 100644
index 00000000000..97061ada0d5
--- /dev/null
+++ b/_images/http/request-flow.svg
@@ -0,0 +1 @@
+
diff --git a/_images/sources/components/messenger/overview.dia b/_images/sources/components/messenger/overview.dia
new file mode 100644
index 00000000000..55ee153439e
Binary files /dev/null and b/_images/sources/components/messenger/overview.dia differ
diff --git a/_images/sources/components/serializer/serializer_workflow.dia b/_images/sources/components/serializer/serializer_workflow.dia
new file mode 100644
index 00000000000..6cb44280d0d
Binary files /dev/null and b/_images/sources/components/serializer/serializer_workflow.dia differ
diff --git a/_images/sources/http/request-flow.dia b/_images/sources/http/request-flow.dia
new file mode 100644
index 00000000000..ca09a05504e
Binary files /dev/null and b/_images/sources/http/request-flow.dia differ
diff --git a/components/messenger.rst b/components/messenger.rst
index 06d618190a0..faa03e8e875 100644
--- a/components/messenger.rst
+++ b/components/messenger.rst
@@ -31,7 +31,9 @@ Alternatively, you can clone the ``_ repos
Concepts
--------
-.. image:: /_images/components/messenger/overview.png
+.. raw:: html
+
+
**Sender**:
Responsible for serializing and sending messages to *something*. This
diff --git a/components/serializer.rst b/components/serializer.rst
index eb09dd7c053..3322f9fab35 100644
--- a/components/serializer.rst
+++ b/components/serializer.rst
@@ -10,7 +10,9 @@ The Serializer Component
In order to do so, the Serializer component follows the following schema.
-.. image:: /_images/components/serializer/serializer_workflow.png
+.. raw:: html
+
+
As you can see in the picture above, an array is used as an intermediary between
objects and serialized contents. This way, encoders will only deal with turning
diff --git a/introduction/from_flat_php_to_symfony2.rst b/introduction/from_flat_php_to_symfony2.rst
index 78ec1280f9f..bb89970783c 100644
--- a/introduction/from_flat_php_to_symfony2.rst
+++ b/introduction/from_flat_php_to_symfony2.rst
@@ -664,9 +664,9 @@ object are sent back to the client.
It's a beautiful thing.
-.. figure:: /_images/http/request-flow.png
- :align: center
- :alt: Symfony request flow
+.. raw:: html
+
+
Where Symfony Delivers
----------------------
diff --git a/introduction/http_fundamentals.rst b/introduction/http_fundamentals.rst
index 6e7cb1cf183..c549d84c925 100644
--- a/introduction/http_fundamentals.rst
+++ b/introduction/http_fundamentals.rst
@@ -361,12 +361,12 @@ to do:
.. _request-flow-figure:
-.. figure:: /_images/http/request-flow.png
- :align: center
- :alt: Symfony request flow
+.. raw:: html
+
+
- Incoming requests are interpreted by the :doc:`Routing component ` and
- passed to PHP functions that return ``Response`` objects.
+Incoming requests are interpreted by the :doc:`Routing component ` and
+passed to PHP functions that return ``Response`` objects.
This may not make sense yet, but as you keep reading, you'll learn about :doc:`routes `
and :doc:`controllers `: the two fundamental parts to creating a page.