diff --git a/docs/source/_static/images/rauc_status.jpg b/docs/source/_static/images/rauc_status.jpg
deleted file mode 100644
index b8ed9f9..0000000
Binary files a/docs/source/_static/images/rauc_status.jpg and /dev/null differ
diff --git a/docs/source/_static/images/rauc_status.png b/docs/source/_static/images/rauc_status.png
new file mode 100644
index 0000000..03d2139
Binary files /dev/null and b/docs/source/_static/images/rauc_status.png differ
diff --git a/docs/source/_static/images/rauc_status_mark_other.jpg b/docs/source/_static/images/rauc_status_mark_other.jpg
deleted file mode 100644
index d8754d4..0000000
Binary files a/docs/source/_static/images/rauc_status_mark_other.jpg and /dev/null differ
diff --git a/docs/source/_static/images/rauc_status_mark_other.png b/docs/source/_static/images/rauc_status_mark_other.png
new file mode 100644
index 0000000..f272e4f
Binary files /dev/null and b/docs/source/_static/images/rauc_status_mark_other.png differ
diff --git a/docs/source/firmware.rst b/docs/source/firmware.rst
index aa7406e..cdd55bf 100644
--- a/docs/source/firmware.rst
+++ b/docs/source/firmware.rst
@@ -34,7 +34,7 @@ The internal eMMC storage of a chargebyte device is divided into several partiti
      - 128 MB
      - Logging file system B (/var/log)
 
-.. image:: _static/images/mountpoints_tarragon.svg
+.. image:: ../../includes/_static/images/mountpoints.svg
    :alt: Filesystem-Mountpoints
    :align: center
 
diff --git a/docs/source/_static/images/mountpoints_tarragon.svg b/includes/_static/images/mountpoints.svg
similarity index 100%
rename from docs/source/_static/images/mountpoints_tarragon.svg
rename to includes/_static/images/mountpoints.svg
diff --git a/includes/firmware_programming.inc b/includes/firmware_programming.inc
index 4f04781..586b2f9 100644
--- a/includes/firmware_programming.inc
+++ b/includes/firmware_programming.inc
@@ -148,7 +148,7 @@ In some situations, e.g., rescuing data of the other partition after a firmware
 
 The chargebyte device uses the RAUC update framework for updating the device with a new firmware version and managing the boot partitions. Before using RAUC command line tool, it is necessary to establish a connection via SSH or Debug UART. After the connection is established, the status of the RAUC managed partitions can be retrieved by using the :code:`rauc status` console command. The following figure shows the console output of the RAUC status command. Here the board was booted from the first partition “rootfs.0” (A).
 
-.. image:: _static/images/rauc_status.jpg
+.. image:: _static/images/rauc_status.png
    :alt: RAUC status
    :align: center
 
@@ -160,7 +160,7 @@ The chargebyte device uses the RAUC update framework for updating the device wit
 
 The rollback to the other partition can now be performed by using the command :code:`rauc status mark-active other`. The console output should now look like the following figure.
 
-.. image:: _static/images/rauc_status_mark_other.jpg
+.. image:: _static/images/rauc_status_mark_other.png
    :alt: RAUC status mark-active
    :align: center