diff --git a/modules/applications/assets/images/ui-builder/guides/file-picker-setting.png b/modules/applications/images/ui-builder/guides/file-picker-setting.png
similarity index 100%
rename from modules/applications/assets/images/ui-builder/guides/file-picker-setting.png
rename to modules/applications/images/ui-builder/guides/file-picker-setting.png
diff --git a/modules/applications/images/ui-builder/guides/submit_task_form.png b/modules/applications/images/ui-builder/guides/submit_task_form.png
deleted file mode 100644
index 215a7c5b04..0000000000
Binary files a/modules/applications/images/ui-builder/guides/submit_task_form.png and /dev/null differ
diff --git a/modules/applications/pages/ui-builder/how-to-handle-document.adoc b/modules/applications/pages/ui-builder/how-to-handle-document.adoc
index 10aa7770dc..a3932a3e04 100644
--- a/modules/applications/pages/ui-builder/how-to-handle-document.adoc
+++ b/modules/applications/pages/ui-builder/how-to-handle-document.adoc
@@ -25,7 +25,7 @@ Go to the `Queries` tab and create a Bonita query that will upload a document, g
 Drag and drop a `FilePicker` widget onto your interface and set the `onFilesSelected` event to call
 the `uploadDocument` query with the selected file as a parameter:
 
-image:ui-builder/guides/file-picker-setting.png[file-picker-setting, 500]
+image::ui-builder/guides/file-picker-setting.png[file-picker-setting, 500]
 
 To test this step, click on the `FilePicker` widget, select a file from your computer, and click on the `Upload` button.
 
diff --git a/modules/bcd/assets/images/images/bcd-capabilities.png b/modules/bcd/images/bcd-capabilities.png
similarity index 100%
rename from modules/bcd/assets/images/images/bcd-capabilities.png
rename to modules/bcd/images/bcd-capabilities.png
diff --git a/modules/bcd/pages/index.adoc b/modules/bcd/pages/index.adoc
index b29d1ab215..ee4ae599b7 100644
--- a/modules/bcd/pages/index.adoc
+++ b/modules/bcd/pages/index.adoc
@@ -19,7 +19,7 @@ We want to assure you that our teams are available to answer your questions and
 
 BCD lets you build a Living Application from source code in a repository and deploy the generated artifacts, all from the command line.
 
-image::images/bcd-capabilities.png[Bonita Continuous Delivery Capabilities]
+image::bcd-capabilities.png[Bonita Continuous Delivery Capabilities]
 
 == Basic concepts
 
diff --git a/modules/build-run/assets/images/build_phase.png b/modules/build-run/images/build_phase.png
similarity index 100%
rename from modules/build-run/assets/images/build_phase.png
rename to modules/build-run/images/build_phase.png