diff --git a/content/applications/general/apps_modules.rst b/content/applications/general/apps_modules.rst
index ba96e90ed..65fa37032 100644
--- a/content/applications/general/apps_modules.rst
+++ b/content/applications/general/apps_modules.rst
@@ -8,7 +8,7 @@ You can :ref:`install <general/install>`, :ref:`upgrade <general/upgrade>` and :
 By default, an *Apps* filter is applied. If you want to search for modules, click on
 *Filters* and select *Extra*.
 
-.. image:: apps-search-filter.png
+.. image:: apps_modules/apps-search-filter.png
    :align: center
    :alt: Add "Extra" filter in Odoo Apps
 
@@ -58,14 +58,14 @@ Uninstall apps and modules
 Go to :menuselection:`Apps`, click on the *dropdown menu* of the app you want to uninstall, then on
 *Uninstall*.
 
-.. image:: uninstall.png
+.. image:: apps_modules/uninstall.png
    :align: center
 
 Some apps have dependencies, meaning that one app requires another. Therefore, uninstalling one app
 may uninstall multiple apps and modules. Odoo warns you which dependant apps and modules are
 affected by it.
 
-.. image:: uninstall_deps.png
+.. image:: apps_modules/uninstall_deps.png
    :align: center
 
 To complete the uninstallation, click on *Confirm*.
diff --git a/content/applications/general/apps-search-filter.png b/content/applications/general/apps_modules/apps-search-filter.png
similarity index 100%
rename from content/applications/general/apps-search-filter.png
rename to content/applications/general/apps_modules/apps-search-filter.png
diff --git a/content/applications/general/uninstall.png b/content/applications/general/apps_modules/uninstall.png
similarity index 100%
rename from content/applications/general/uninstall.png
rename to content/applications/general/apps_modules/uninstall.png
diff --git a/content/applications/general/uninstall_deps.png b/content/applications/general/apps_modules/uninstall_deps.png
similarity index 100%
rename from content/applications/general/uninstall_deps.png
rename to content/applications/general/apps_modules/uninstall_deps.png
diff --git a/content/applications/general/developer_mode.rst b/content/applications/general/developer_mode.rst
index 93d6675aa..47176f8ce 100644
--- a/content/applications/general/developer_mode.rst
+++ b/content/applications/general/developer_mode.rst
@@ -11,7 +11,7 @@ Activate through the Settings
 
 Go to :menuselection:`Settings --> Activate the developer mode`.
 
-.. image:: settings.png
+.. image:: developer_mode/settings.png
    :align: center
    :alt: Overview of the debug options under settings in Odoo
 
@@ -29,7 +29,7 @@ Activate through a browser extension
 | For the *Odoo Debug* extension, a single click enables a normal version of the mode, while a
   double click enables it with assets. To deactivate it, use a single click.
 
-.. image:: monkey.png
+.. image:: developer_mode/monkey.png
    :align: center
    :alt: View of odoo’s debug icon in a chrome’s toolbar
 
@@ -50,7 +50,7 @@ Activate through the URL
 In the URL, add ``?debug=1`` or ``?debug=true`` after *web*. To deactivate the
 debug mode, add `?debug=0` instead.
 
-.. image:: url.png
+.. image:: developer_mode/url.png
    :align: center
    :alt: Overview of an url with the debug mode command added in Odoo
 
@@ -73,7 +73,7 @@ It contains some useful menu items such as:
 - see the `fields view get`
 - and much more.
 
-.. image:: button_location.png
+.. image:: developer_mode/button_location.png
    :align: center
    :alt: Overview of a console page and the debug icon being shown in Odoo
 
diff --git a/content/applications/general/button_location.png b/content/applications/general/developer_mode/button_location.png
similarity index 100%
rename from content/applications/general/button_location.png
rename to content/applications/general/developer_mode/button_location.png
diff --git a/content/applications/general/monkey.png b/content/applications/general/developer_mode/monkey.png
similarity index 100%
rename from content/applications/general/monkey.png
rename to content/applications/general/developer_mode/monkey.png
diff --git a/content/applications/general/settings.png b/content/applications/general/developer_mode/settings.png
similarity index 100%
rename from content/applications/general/settings.png
rename to content/applications/general/developer_mode/settings.png
diff --git a/content/applications/general/url.png b/content/applications/general/developer_mode/url.png
similarity index 100%
rename from content/applications/general/url.png
rename to content/applications/general/developer_mode/url.png