diff --git a/assets/controllers/back_signalement_edit_file/back_signalement_edit_file.js b/assets/controllers/back_signalement_edit_file/back_signalement_edit_file.js
index e293a484f..582fc87f9 100644
--- a/assets/controllers/back_signalement_edit_file/back_signalement_edit_file.js
+++ b/assets/controllers/back_signalement_edit_file/back_signalement_edit_file.js
@@ -60,8 +60,11 @@ document.querySelectorAll('.btn-signalement-file-edit').forEach(swbtn => {
     + ' par '+ target.getAttribute('data-partner-name')+target.getAttribute('data-user-name')
     document.querySelector('#file-edit-fileid').value = target.getAttribute('data-file-id')
 
+    const selectedDocumentType = target.getAttribute('data-documentType'); 
+    document.querySelector('#fileDescription').value = target.getAttribute('data-description')
+    document.querySelector('#fr-modal-edit-file-description').classList.remove('fr-hidden')
+
     const documentTypes = JSON.parse(target.getAttribute('data-documentType-list'));
-    const selectedDocumentType = target.getAttribute('data-documentType');
     let typeSelectBox = document.querySelector('#document-type-select');
     typeSelectBox.innerHTML = '';
     let option = new Option('Sélectionnez un type', '');
diff --git a/assets/controllers/back_signalement_view/form_upload_documents.js b/assets/controllers/back_signalement_view/form_upload_documents.js
index 674a3163a..167a1a4ca 100644
--- a/assets/controllers/back_signalement_view/form_upload_documents.js
+++ b/assets/controllers/back_signalement_view/form_upload_documents.js
@@ -1,19 +1,45 @@
-const modalUploadFiles = document?.querySelector('#fr-modal-upload-files')
-if (modalUploadFiles) {
-    const dropArea = document.querySelector('.modal-upload-drop-section')
-    const listContainer = document.querySelector('.modal-upload-list')
-    const fileSelector = document.querySelector('.modal-upload-files-selector')
-    const fileSelectorInput = document.querySelector('.modal-upload-files-selector-input')
-    const addFileRoute = modalUploadFiles.dataset.addFileRoute
-    const addFileToken = modalUploadFiles.dataset.addFileToken
-    const waitingSuiviRoute = modalUploadFiles.dataset.waitingSuiviRoute
-    const deleteTmpFileRoute = modalUploadFiles.dataset.deleteTmpFileRoute
-    const selectTypeToClone = document.querySelector('#select-type-to-clone')
-    const selectDesordreToClone = document.querySelector('#select-desordre-to-clone')
-    const editFileRoute = modalUploadFiles.dataset.editFileRoute
-    const editFileToken = modalUploadFiles.dataset.editFileToken
-    const ancre = document.querySelector('#modal-upload-file-dynamic-content')
-    const btnValidate = document.querySelector('#btn-validate-modal-upload-files')
+initializeUploadModal(
+    '#fr-modal-upload-files',
+    '#select-type-situation-to-clone',
+    '#select-type-procedure-to-clone',
+    '#select-desordre-to-clone',
+);
+
+document?.querySelectorAll('.fr-modal-visites-upload-files')?.forEach(modalVisiteUpload => {
+    initializeUploadModal(
+        '#'+modalVisiteUpload.id,
+        null,
+        null,
+        null,
+    )
+})
+
+
+function initializeUploadModal(
+    modalSelector, 
+    selectTypeSituationToCloneSelector, 
+    selectTypeProcedureToCloneSelector, 
+    selectDesordreToCloneSelector, 
+) {
+    const modal = document?.querySelector(modalSelector);
+    if (!modal) return;
+
+    const dropArea = modal.querySelector('.modal-upload-drop-section');
+    const listContainer = modal.querySelector('.modal-upload-list');
+    const fileSelector = modal.querySelector('.modal-upload-files-selector')
+    const fileSelectorInput = modal.querySelector('.modal-upload-files-selector-input')
+    const addFileRoute = modal.dataset.addFileRoute;
+    const addFileToken = modal.dataset.addFileToken;
+    const waitingSuiviRoute = modal.dataset.waitingSuiviRoute;
+    const deleteTmpFileRoute = modal.dataset.deleteTmpFileRoute;
+    const selectTypeSituationToClone = selectTypeSituationToCloneSelector ? modal.querySelector(selectTypeSituationToCloneSelector) : null;
+    const selectTypeProcedureToClone = selectTypeProcedureToCloneSelector ? modal.querySelector(selectTypeProcedureToCloneSelector) : null;
+    const selectDesordreToClone = selectDesordreToCloneSelector ? modal.querySelector(selectDesordreToCloneSelector) : null;    
+    const editFileRoute = modal.dataset.editFileRoute;
+    const editFileToken = modal.dataset.editFileToken;
+    const btnValidate = modal.querySelector('#btn-validate-modal-upload-files');
+    const ancre = modal.querySelector('#modal-upload-file-dynamic-content');
+
 
     fileSelector.onclick = () => fileSelectorInput.click()
     fileSelectorInput.onchange = () => {
@@ -81,7 +107,7 @@ if (modalUploadFiles) {
         listContainer.prepend(div)
         let http = new XMLHttpRequest()
         let data = new FormData()
-        if (modalUploadFiles.dataset.fileType == 'photo') {
+        if (modal.dataset.fileType == 'photo') {
             data.append('signalement-add-file[photos][]', file)
         } else {
             data.append('signalement-add-file[documents][]', file)
@@ -98,20 +124,35 @@ if (modalUploadFiles) {
                 let btnDeleteTmpFile = div.querySelector('a.delete-tmp-file')
                 addEventListenerDeleteTmpFile(btnDeleteTmpFile)
                 if (this.status == 200) {
-                    modalUploadFiles.dataset.hasChanges = true
-                    if (modalUploadFiles.dataset.fileType == 'photo') {
-                        var clone = selectDesordreToClone.cloneNode(true)
-                        clone.id = 'select-desordre-' + response.response
-                    } else {
-                        var clone = selectTypeToClone.cloneNode(true)
-                        clone.id = 'select-type-' + response.response
-                    }
-                    clone.dataset.fileId = response.response
-                    if (clone.querySelectorAll('option').length == 1) {
-                        clone.remove()
+                    modal.dataset.hasChanges = true
+                    if (null !== selectDesordreToClone || null !== selectTypeSituationToClone || null !== selectTypeProcedureToClone){
+                        let clone
+                        if (modal.dataset.fileType == 'photo') {
+                            clone = selectDesordreToClone.cloneNode(true)
+                            clone.id = 'select-desordre-' + response.response
+                        }else{
+                            if ('situation' === modal.dataset.fileFilter ){
+                                clone = selectTypeSituationToClone.cloneNode(true)
+                            } else {
+                                clone = selectTypeProcedureToClone.cloneNode(true)
+                            }
+                            clone.id = 'select-type-' + response.response
+                        }
+                        clone.dataset.fileId = response.response
+                        if (clone.querySelectorAll('option').length == 1) {
+                            clone.remove()
+                        } else {
+                            div.querySelector('.select-container').appendChild(clone)
+                            addEventListenerSelectTypeDesordre(clone)
+                        }
                     } else {
-                        div.querySelector('.select-container').appendChild(clone)
-                        addEventListenerSelectTypeDesordre(clone)
+                        if (null !== modal.dataset.documentType){
+                            let divFileId = div.querySelector('#file-id')
+                            divFileId.value = response.response
+                            callEditFileRoute(div)
+                            addEventListenerDescription(div)
+                        }
+
                     }
                     btnDeleteTmpFile.href = btnDeleteTmpFile.href.replace('REPLACE', response.response)
                     btnDeleteTmpFile.classList.remove('fr-hidden', 'delete-html')
@@ -127,8 +168,8 @@ if (modalUploadFiles) {
     }
 
     function initInnerHtml(file) {
-        var innerHTML =`<div class="fr-col-12 file-error"></div>`;
-        if (modalUploadFiles.dataset.fileType == 'photo') {
+        let innerHTML =`<div class="fr-col-12 file-error"></div>`;
+        if (modal.dataset.fileType == 'photo') {
             innerHTML += `
             <div class="fr-col-2">
                 <img class="fr-content-media__img" src="${URL.createObjectURL(file)}">
@@ -149,9 +190,21 @@ if (modalUploadFiles) {
                 <span>0%</span>
             </div>
         </div>
-        <div class="fr-col-3 select-container">           
-        </div>
-        <div class="fr-col-1">
+        `
+        if (modal.dataset.documentType == 'PHOTO_VISITE') {
+            innerHTML += `
+            <div class="fr-col-3">                
+                <input type="text" id="file-description" name="file[description]"
+                required="required" class="fr-input" placeholder="Description de l'image">
+                <input type="hidden" id="file-id" name="file[id]">
+            </div>           
+            `
+        } else{
+            innerHTML += `<div class="fr-col-3 select-container">           
+            </div>
+            <input type="hidden" id="file-id" name="file[id]">`
+        }
+        innerHTML += `<div class="fr-col-1">
             <a href="${deleteTmpFileRoute}" title="Supprimer" class="fr-btn fr-btn--sm fr-btn--secondary fr-background--white fr-fi-delete-line fr-hidden delete-tmp-file delete-html"></a>         
         </div>
         `
@@ -164,7 +217,7 @@ if (modalUploadFiles) {
             let http = new XMLHttpRequest()
             let data = new FormData()
             data.append('file_id', selectField.dataset.fileId)
-            if (modalUploadFiles.dataset.fileType == 'photo') {
+            if (modal.dataset.fileType == 'photo') {
                 data.append('documentType', 'PHOTO_SITUATION')
                 data.append('desordreSlug', selectField.value)
             } else {
@@ -206,9 +259,41 @@ if (modalUploadFiles) {
         })
     }
 
+    function callEditFileRoute(divFileItem) {
+        let httpEdit = new XMLHttpRequest()
+        let dataEdit = new FormData()
+        dataEdit.append('file_id', divFileItem.querySelector('#file-id')?.value)
+        dataEdit.append('documentType', modal.dataset.documentType)            
+        dataEdit.append('interventionId', modal.dataset.interventionId) 
+        dataEdit.append('description', divFileItem.querySelector('#file-description')?.value)
+
+        dataEdit.append('_token', editFileToken)
+        httpEdit.onreadystatechange = function () {
+            if (this.readyState == XMLHttpRequest.DONE) {
+                let response = JSON.parse(this.response)
+                if (this.status != 200) {
+                    let parent = divFileItem
+                    parent.querySelector('.file-error').innerHTML = '<div class="fr-alert fr-alert--error fr-alert--sm">' + response.response + '</div>'
+
+                }
+            }
+        }
+        httpEdit.open('POST', editFileRoute, true)
+        httpEdit.setRequestHeader("X-Requested-With", "XMLHttpRequest")
+        httpEdit.send(dataEdit)
+    }
+
+    function addEventListenerDescription(divFileItem) {
+            listContainer?.querySelectorAll('.fr-grid-row')?.forEach(divFileItem => {
+                divFileItem.querySelector('#file-description')?.addEventListener('change', (e) => {
+                    callEditFileRoute(divFileItem)
+                })
+            })
+    }
 
-    modalUploadFiles.addEventListener('dsfr.conceal', (e) => {
-        if (modalUploadFiles.dataset.validated == "true" && modalUploadFiles.dataset.hasChanges == "true") {
+
+    modal.addEventListener('dsfr.conceal', (e) => {
+        if (modal.dataset.validated == "true" && modal.dataset.hasChanges == "true") {
             fetch(waitingSuiviRoute).then((response) => {
                 window.location.reload()
             })
@@ -217,37 +302,49 @@ if (modalUploadFiles) {
         document.querySelectorAll('a.delete-tmp-file').forEach((button) => {
             button.click()
         })
-        modalUploadFiles.dataset.hasChanges = false
+        modal.dataset.hasChanges = false
     })
 
-    let fileType
+    let fileType, fileFilter, documentType, interventionId
     document.querySelectorAll('.open-modal-upload-files-btn').forEach((button) => {
         button.addEventListener('click', (e) => {
             fileType = e.target.dataset.fileType
+            fileFilter = e.target.dataset.fileFilter ?? null
+            documentType = e.target.dataset.documentType ?? null
+            interventionId = e.target.dataset.interventionId ?? null
         })
     })
 
-    modalUploadFiles.addEventListener('dsfr.disclose', (e) => {
+    modal.addEventListener('dsfr.disclose', (e) => {
         listContainer.innerHTML = '';
-        modalUploadFiles.dataset.validated = false
-        modalUploadFiles.dataset.hasChanges = false
-        modalUploadFiles.querySelectorAll('.type-conditional').forEach((type) => {
+        modal.dataset.validated = false
+        modal.dataset.hasChanges = false
+        modal.querySelectorAll('.type-conditional').forEach((type) => {
             type.classList.add('fr-hidden')
         })
+        modal.querySelectorAll('.filter-conditional').forEach((type) => {
+            type.classList.add('fr-hidden')
+        })
+        modal.dataset.documentType = documentType
+        modal.dataset.fileFilter = fileFilter
+        modal.dataset.interventionId = interventionId        
         if (fileType == 'photo') {
-            modalUploadFiles.dataset.fileType = 'photo'
-            modalUploadFiles.querySelector('.type-photo').classList.remove('fr-hidden')
+            modal.dataset.fileType = 'photo'
+            modal.querySelector('.type-photo').classList.remove('fr-hidden')
             fileSelectorInput.setAttribute('accept', 'image/*')
         } else {
-            modalUploadFiles.dataset.fileType = 'document'
-            modalUploadFiles.querySelector('.type-document').classList.remove('fr-hidden')
+            modal.dataset.fileType = 'document'
+            modal.querySelector('.type-document').classList.remove('fr-hidden')
             fileSelectorInput.setAttribute('accept', '*/*')
+        }   
+        if (fileFilter == 'procedure') {
+            modal.querySelector('.filter-procedure').classList.remove('fr-hidden')
+        } else if (fileFilter == 'situation')  {
+            modal.querySelector('.filter-situation').classList.remove('fr-hidden')
         }
     })
 
     btnValidate.addEventListener('click', (e) => {
-        modalUploadFiles.dataset.validated = true
+        modal.dataset.validated = true
     })
-
-
 }
\ No newline at end of file
diff --git a/migrations/Version20240329143924.php b/migrations/Version20240329143924.php
new file mode 100644
index 000000000..7e3a275e6
--- /dev/null
+++ b/migrations/Version20240329143924.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+namespace DoctrineMigrations;
+
+use App\Entity\File;
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20240329143924 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Set file_type document for document_type SITUATION_FOYER_BAIL, SITUATION_FOYER_ETAT_DES_LIEUX or SITUATION_FOYER_DPE ';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('UPDATE file SET file_type = \''.File::FILE_TYPE_DOCUMENT
+            .'\' WHERE document_type = \'SITUATION_FOYER_BAIL\' AND file_type = \''.File::FILE_TYPE_PHOTO.'\'');
+        $this->addSql('UPDATE file SET file_type = \''.File::FILE_TYPE_DOCUMENT
+            .'\' WHERE document_type = \'SITUATION_FOYER_ETAT_DES_LIEUX\' AND file_type = \''.File::FILE_TYPE_PHOTO.'\'');
+        $this->addSql('UPDATE file SET file_type = \''.File::FILE_TYPE_DOCUMENT
+            .'\' WHERE document_type = \'SITUATION_FOYER_DPE\' AND file_type = \''.File::FILE_TYPE_PHOTO.'\'');
+    }
+
+    public function down(Schema $schema): void
+    {
+    }
+}
diff --git a/src/Controller/Back/SignalementController.php b/src/Controller/Back/SignalementController.php
index b1e758bf1..3e6c3c5a2 100755
--- a/src/Controller/Back/SignalementController.php
+++ b/src/Controller/Back/SignalementController.php
@@ -21,6 +21,7 @@
 use App\Repository\SignalementQualificationRepository;
 use App\Repository\TagRepository;
 use App\Security\Voter\UserVoter;
+use App\Service\Signalement\PhotoHelper;
 use App\Service\Signalement\SignalementDesordresProcessor;
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -178,6 +179,8 @@ public function viewSignalement(
 
         $partnerVisite = $affectationRepository->findAffectationWithQualification(Qualification::VISITES, $signalement);
 
+        $allPhotosOrdered = PhotoHelper::getSortedPhotos($signalement);
+
         return $this->render('back/signalement/view.html.twig', [
             'title' => 'Signalement',
             'createdFromDraft' => $signalement->getCreatedFrom(),
@@ -206,6 +209,7 @@ public function viewSignalement(
             'partnersCanVisite' => $partnerVisite,
             'pendingVisites' => $interventionRepository->getPendingVisitesForSignalement($signalement),
             'isDocumentsEnabled' => $parameterBag->get('feature_documents_enable'),
+            'allPhotosOrdered' => $allPhotosOrdered,
         ]);
     }
 
diff --git a/src/Controller/Back/SignalementFileController.php b/src/Controller/Back/SignalementFileController.php
index 4060ee791..14ade9493 100755
--- a/src/Controller/Back/SignalementFileController.php
+++ b/src/Controller/Back/SignalementFileController.php
@@ -12,6 +12,7 @@
 use App\Manager\SuiviManager;
 use App\Messenger\Message\PdfExportMessage;
 use App\Repository\FileRepository;
+use App\Repository\InterventionRepository;
 use App\Service\Signalement\SignalementFileProcessor;
 use App\Service\UploadHandlerService;
 use Doctrine\ORM\EntityManagerInterface;
@@ -166,12 +167,13 @@ public function deleteFileSignalement(
                 $suivi = $suiviFactory->createInstanceFrom($this->getUser(), $signalement);
                 /** @var User $user */
                 $user = $this->getUser();
-                $description = $user->getNomComplet().' a supprimé le document suivant :';
+                $description = $user->getNomComplet().' a supprimé ';
+                $description .= File::FILE_TYPE_DOCUMENT === $type ? 'le document suivant :' : 'la photo suivante :';
                 $suivi->setDescription(
                     $description
-                    .'<ul>'
+                    .'<ul><li>'
                     .$filename
-                    .'</ul>'
+                    .'</li></ul>'
                 );
                 $suivi->setType(SUIVI::TYPE_AUTO);
 
@@ -214,6 +216,7 @@ public function editFileSignalement(
         Request $request,
         FileRepository $fileRepository,
         EntityManagerInterface $entityManager,
+        InterventionRepository $interventionRepository,
     ): Response {
         if (!$this->isCsrfTokenValid('signalement_edit_file_'.$signalement->getId(), $request->get('_token'))) {
             if ($request->isXmlHttpRequest()) {
@@ -250,6 +253,17 @@ public function editFileSignalement(
         $file->setDocumentType($documentType);
         $desordreSlug = $request->get('desordreSlug');
         $file->setDesordreSlug($desordreSlug);
+        $interventionId = $request->get('interventionId');
+        if (null !== $interventionId) {
+            $intervention = $interventionRepository->find($interventionId);
+            if ($intervention?->getSignalement() === $file->getSignalement()) {
+                $file->setIntervention($intervention);
+            }
+        }
+        $description = $request->get('description');
+        if (null !== $description) {
+            $file->setDescription($description);
+        }
         $entityManager->persist($file);
         $entityManager->flush();
         if ($request->isXmlHttpRequest()) {
diff --git a/src/DataFixtures/Files/NewSignalement.yml b/src/DataFixtures/Files/NewSignalement.yml
index c4363ca61..cb02939e1 100644
--- a/src/DataFixtures/Files/NewSignalement.yml
+++ b/src/DataFixtures/Files/NewSignalement.yml
@@ -84,13 +84,18 @@ signalements:
       - "desordres_logement_securite_sol_dangereux_pieces_piece_a_vivre"
       - "desordres_logement_securite_balcons_pieces_salle_de_bain"
       - "desordres_logement_securite_plomb_pieces_salle_de_bain_diagnostique_oui"
-    desordre_photos:
+    files:
       - file: "Capture-d-ecran-du-2023-06-13-12-58-43-648b2a6b9730f.png"
         titre: "Capture-d-ecran-du-2023-06-13-12-58-43-648b2a6b9730f.png"
         slug: "desordres_batiment_proprete_interieur"
+        document_type: "PHOTO_SITUATION"
+      - file: "Capture-d-ecran-du-2023-06-13-12-58-43-648b2a6b9730f.png"
+        titre: "Capture-d-ecran-du-2023-06-13-12-58-43-648b2a6b9730f.png"
+        document_type: "AUTRE"
       - file: "Capture-d-ecran-du-2023-06-13-12-58-43-648b2a6b9730f.png"
         titre: "Capture-d-ecran-du-2023-06-13-12-58-43-648b2a6b9730f.png"
         slug: "desordres_logement_chauffage_details_fenetres_permeables"
+        document_type: "PHOTO_SITUATION"
   -
     territory: "Pas-de-Calais"
     uuid: "00000000-0000-0000-2024-000000000002"
diff --git a/src/DataFixtures/Loader/LoadSignalementData.php b/src/DataFixtures/Loader/LoadSignalementData.php
index 56eb37ba3..41919c8f3 100644
--- a/src/DataFixtures/Loader/LoadSignalementData.php
+++ b/src/DataFixtures/Loader/LoadSignalementData.php
@@ -434,16 +434,16 @@ private function loadNewSignalements(ObjectManager $manager, array $row)
                 $signalement->addSignalementQualification($signalementQualification);
             }
         }
-        if (isset($row['desordre_photos'])) {
-            foreach ($row['desordre_photos'] as $document) {
+        if (isset($row['files'])) {
+            foreach ($row['files'] as $document) {
                 $file = $this->fileFactory->createInstanceFrom(
                     filename: $document['file'],
                     title: $document['titre'],
-                    type: File::FILE_TYPE_PHOTO,
+                    type: $document['file_type'] ?? File::FILE_TYPE_PHOTO,
                     signalement: $signalement,
                     // user: $user,
-                    documentType: DocumentType::PHOTO_SITUATION,
-                    desordreSlug: $document['slug']
+                    documentType: DocumentType::tryFrom($document['document_type']) ?? DocumentType::PHOTO_SITUATION,
+                    desordreSlug: $document['slug'] ?? null
                 );
                 $manager->persist($file);
             }
diff --git a/src/Entity/Enum/DocumentType.php b/src/Entity/Enum/DocumentType.php
index 44ba600f3..c6d2b7b53 100644
--- a/src/Entity/Enum/DocumentType.php
+++ b/src/Entity/Enum/DocumentType.php
@@ -3,6 +3,7 @@
 namespace App\Entity\Enum;
 
 use App\Entity\Behaviour\EnumTrait;
+use App\Entity\File;
 
 enum DocumentType: String
 {
@@ -47,18 +48,25 @@ public static function getPhotosList(): array
     {
         return [
             self::PHOTO_SITUATION->name => self::PHOTO_SITUATION->label(),
-            self::PHOTO_VISITE->name => self::PHOTO_VISITE->label(),
             self::AUTRE->name => self::AUTRE->label(),
         ];
     }
 
-    public static function getDocumentsList(): array
+    public static function getSituationList(): array
     {
         return [
+            self::PHOTO_SITUATION->name => self::PHOTO_SITUATION->label(),
+            self::AUTRE->name => self::AUTRE->label(),
             self::SITUATION_FOYER_BAIL->name => self::SITUATION_FOYER_BAIL->label(),
             self::SITUATION_FOYER_DPE->name => self::SITUATION_FOYER_DPE->label(),
             self::SITUATION_FOYER_ETAT_DES_LIEUX->name => self::SITUATION_FOYER_ETAT_DES_LIEUX->label(),
             self::SITUATION_DIAGNOSTIC_PLOMB_AMIANTE->name => self::SITUATION_DIAGNOSTIC_PLOMB_AMIANTE->label(),
+        ];
+    }
+
+    public static function getProcedureList(): array
+    {
+        return [
             self::PROCEDURE_MISE_EN_DEMEURE->name => self::PROCEDURE_MISE_EN_DEMEURE->label(),
             self::PROCEDURE_RAPPORT_DE_VISITE->name => self::PROCEDURE_RAPPORT_DE_VISITE->label(),
             self::PROCEDURE_ARRETE_MUNICIPAL->name => self::PROCEDURE_ARRETE_MUNICIPAL->label(),
@@ -66,9 +74,20 @@ public static function getDocumentsList(): array
             self::PROCEDURE_SAISINE->name => self::PROCEDURE_SAISINE->label(),
             self::BAILLEUR_DEVIS_POUR_TRAVAUX->name => self::BAILLEUR_DEVIS_POUR_TRAVAUX->label(),
             self::BAILLEUR_REPONSE_BAILLEUR->name => self::BAILLEUR_REPONSE_BAILLEUR->label(),
-            self::PHOTO_SITUATION->name => self::PHOTO_SITUATION->label(),
-            self::PHOTO_VISITE->name => self::PHOTO_VISITE->label(),
-            self::AUTRE->name => self::AUTRE->label(),
         ];
     }
+
+    public function mapFileType(): ?string
+    {
+        return match ($this) {
+            self::SITUATION_FOYER_BAIL, self::SITUATION_FOYER_DPE,
+            self::SITUATION_FOYER_ETAT_DES_LIEUX, self::SITUATION_DIAGNOSTIC_PLOMB_AMIANTE,
+            self::PROCEDURE_MISE_EN_DEMEURE, self::PROCEDURE_RAPPORT_DE_VISITE,
+            self::PROCEDURE_ARRETE_MUNICIPAL, self::PROCEDURE_ARRETE_PREFECTORAL,
+            self::PROCEDURE_SAISINE, self::BAILLEUR_DEVIS_POUR_TRAVAUX,
+            self::BAILLEUR_REPONSE_BAILLEUR, => File::FILE_TYPE_DOCUMENT,
+            self::PHOTO_SITUATION,self::PHOTO_VISITE => File::FILE_TYPE_PHOTO,
+            self::AUTRE => null,
+        };
+    }
 }
diff --git a/src/Entity/File.php b/src/Entity/File.php
index 7b51aaf28..a792d9d0c 100644
--- a/src/Entity/File.php
+++ b/src/Entity/File.php
@@ -260,4 +260,11 @@ public function setIsWaitingSuivi(bool $isWaitingSuivi): self
 
         return $this;
     }
+
+    public function isSituationPhoto(): bool
+    {
+        return $this->fileType === $this::FILE_TYPE_PHOTO
+        && \array_key_exists($this->documentType->value, DocumentType::getSituationList())
+        && null === $this->intervention;
+    }
 }
diff --git a/src/Entity/Intervention.php b/src/Entity/Intervention.php
index c2501869d..c8df44b54 100644
--- a/src/Entity/Intervention.php
+++ b/src/Entity/Intervention.php
@@ -3,6 +3,7 @@
 namespace App\Entity;
 
 use App\Entity\Behaviour\TimestampableTrait;
+use App\Entity\Enum\DocumentType;
 use App\Entity\Enum\InterventionType;
 use App\Entity\Enum\ProcedureType;
 use App\Repository\InterventionRepository;
@@ -316,4 +317,14 @@ public function removeFile(File $file): self
 
         return $this;
     }
+
+    /**
+     * @return Collection<int, File>
+     */
+    public function getRapportDeVisite(): Collection
+    {
+        return $this->files->filter(function (File $file) {
+            return DocumentType::PROCEDURE_RAPPORT_DE_VISITE === $file->getDocumentType();
+        });
+    }
 }
diff --git a/src/Factory/FileFactory.php b/src/Factory/FileFactory.php
index 191681dcd..df95f27e8 100644
--- a/src/Factory/FileFactory.php
+++ b/src/Factory/FileFactory.php
@@ -78,19 +78,20 @@ public function createFromFileArray(
         return $this->createInstanceFrom(
             filename: $file['file'],
             title: $file['titre'],
-            type: $this->getFileType($file),
+            type: $this->getFileType($file, $documentType),
             signalement: $signalement,
             user: $user,
             intervention: $intervention,
-            documentType: SignalementDocumentTypeMapper::map($file['slug']),
+            documentType: $documentType,
             desordreSlug: $desordreSlug,
             description: $fileDescription,
         );
     }
 
-    private function getFileType(array $file)
+    private function getFileType(array $file, DocumentType $documentType)
     {
         if ('photos' === $file['key']
+            && File::FILE_TYPE_PHOTO === $documentType->mapFileType()
             && \in_array(
                 strtolower(pathinfo($file['file'], \PATHINFO_EXTENSION)),
                 ImageManipulationHandler::IMAGE_EXTENSION
diff --git a/src/Manager/InterventionManager.php b/src/Manager/InterventionManager.php
index 578cb86c8..ad39d2d1c 100644
--- a/src/Manager/InterventionManager.php
+++ b/src/Manager/InterventionManager.php
@@ -13,7 +13,6 @@
 use App\Entity\User;
 use App\Factory\FileFactory;
 use App\Repository\InterventionRepository;
-use App\Service\ImageManipulationHandler;
 use App\Service\Signalement\Qualification\SignalementQualificationUpdater;
 use Doctrine\Persistence\ManagerRegistry;
 use League\Flysystem\FilesystemOperator;
@@ -207,24 +206,22 @@ public function editVisiteFromRequest(VisiteRequest $visiteRequest): ?Interventi
         return $intervention;
     }
 
-    private function createFile(Intervention $intervention, string $document): File
-    {
+    private function createFile(
+        Intervention $intervention,
+        string $document,
+        string $fileType = File::FILE_TYPE_DOCUMENT,
+        DocumentType $documentType = DocumentType::PROCEDURE_RAPPORT_DE_VISITE
+    ): File {
         /** @var User $user */
         $user = $this->security->getUser();
 
-        $fileType = File::FILE_TYPE_DOCUMENT;
-        if (\in_array($this->fileStorage->mimeType($document), ImageManipulationHandler::IMAGE_MIME_TYPES)) {
-            $fileType = File::FILE_TYPE_PHOTO;
-        }
-
-        // TODO : quand la modale sera fait, le documentType pourra être différent
         return $this->fileFactory->createInstanceFrom(
             filename: $document,
             title: $document,
             type: $fileType,
             signalement: $intervention->getSignalement(),
             user: $user,
-            documentType: DocumentType::PROCEDURE_RAPPORT_DE_VISITE
+            documentType: $documentType
         );
     }
 }
diff --git a/src/Manager/SignalementManager.php b/src/Manager/SignalementManager.php
index a96d70b4d..e701f1bb6 100644
--- a/src/Manager/SignalementManager.php
+++ b/src/Manager/SignalementManager.php
@@ -13,11 +13,9 @@
 use App\Dto\Request\Signalement\SituationFoyerRequest;
 use App\Dto\SignalementAffectationListView;
 use App\Entity\Affectation;
-use App\Entity\Enum\DocumentType;
 use App\Entity\Enum\MotifCloture;
 use App\Entity\Enum\ProfileDeclarant;
 use App\Entity\Enum\ProprioType;
-use App\Entity\File;
 use App\Entity\Model\InformationComplementaire;
 use App\Entity\Model\InformationProcedure;
 use App\Entity\Model\SituationFoyer;
@@ -804,16 +802,6 @@ public function findSignalementAffectationIterable(
         }
     }
 
-    public function getPhotosBySlug(Signalement $signalement, string $desordrePrecisionSlug): ?array
-    {
-        $photos = $signalement->getPhotos()->filter(function (File $file) use ($desordrePrecisionSlug) {
-            return DocumentType::PHOTO_SITUATION === $file->getDocumentType()
-            && $file->getDesordreSlug() === $desordrePrecisionSlug;
-        });
-
-        return $photos->toArray();
-    }
-
     /**
      * @todo: Investigate Twig\Error\RuntimeError in ajax request
      * Hack: generate csrf token in side server for ajav request
diff --git a/src/Manager/SuiviManager.php b/src/Manager/SuiviManager.php
index 7a79fc8ef..fbe910e27 100644
--- a/src/Manager/SuiviManager.php
+++ b/src/Manager/SuiviManager.php
@@ -2,12 +2,15 @@
 
 namespace App\Manager;
 
+use App\Entity\Enum\DocumentType;
 use App\Entity\File;
+use App\Entity\Intervention;
 use App\Entity\Signalement;
 use App\Entity\Suivi;
 use App\Entity\User;
 use App\EventListener\SignalementUpdatedListener;
 use App\Factory\SuiviFactory;
+use App\Repository\DesordreCritereRepository;
 use Doctrine\Persistence\ManagerRegistry;
 use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
@@ -20,6 +23,7 @@ public function __construct(
         private readonly UrlGeneratorInterface $urlGenerator,
         protected SignalementUpdatedListener $signalementUpdatedListener,
         protected Security $security,
+        private DesordreCritereRepository $desordreCritereRepository,
         string $entityName = Suivi::class
     ) {
         parent::__construct($managerRegistry, $entityName);
@@ -74,34 +78,103 @@ public function createInstanceForFilesSignalement(User $user, Signalement $signa
     {
         $nbDocs = 0;
         $nbPhotos = 0;
+        /** @var ?DocumentType $documentType */
+        $documentType = null;
+
+        /** @var ?Intervention $intervention */
+        $intervention = null;
         foreach ($files as $file) {
             if (File::FILE_TYPE_PHOTO === $file->getFileType()) {
                 ++$nbPhotos;
             } else {
                 ++$nbDocs;
             }
+            $documentType = $file->getDocumentType();
+            $intervention = $file->getIntervention();
         }
         $description = '';
-        if ($nbDocs > 0) {
-            $description .= $nbDocs;
-            $description .= $nbDocs > 1 ? ' documents partenaires' : ' document partenaire';
+        $isVisibleUsager = false;
+
+        if (\array_key_exists($documentType?->value, DocumentType::getProcedureList()) && null === $intervention) {
+            if ($nbDocs > 0) {
+                $description .= $nbDocs;
+                $description .= $nbDocs > 1 ? ' documents partenaires ont été ajoutés' : ' document partenaire a été ajouté';
+                $description .= ' au signalement.';
+            }
         }
-        if ($nbPhotos > 0) {
-            if ('' !== $description) {
-                $description .= ' et ';
+
+        if (\array_key_exists($documentType?->value, DocumentType::getSituationList())) {
+            $isVisibleUsager = true;
+            if ($nbDocs > 0) {
+                $description .= $nbDocs;
+                $description .= $nbDocs > 1 ? ' documents ' : ' document ';
+                $description .= 'sur la situation usager';
+            }
+
+            if ($nbPhotos > 0) {
+                if ('' !== $description) {
+                    $description .= ' et ';
+                }
+                $description .= $nbPhotos;
+                $description .= $nbPhotos > 1 ? ' photos' : ' photo';
+                if (null !== $signalement->getCreatedFrom()) {
+                    $description .= ' concernant les désordres suivants';
+                }
+            }
+            if (0 === $nbDocs && $nbPhotos > 1) {
+                $description .= ' ont été ajoutées au signalement : ';
+            } elseif ($nbDocs + $nbPhotos > 1) {
+                $description .= ' ont été ajoutés au signalement : ';
+            } elseif (1 === $nbPhotos) {
+                $description .= ' a été ajoutée au signalement : ';
             }
-            $description .= $nbPhotos;
-            $description .= $nbPhotos > 1 ? ' photos' : ' photo';
         }
-        if ($nbDocs + $nbPhotos > 1) {
-            $description .= ' ont été ajoutés au signalement : ';
-        } else {
-            $description .= ' a été ajouté au signalement : ';
+
+        if (DocumentType::PROCEDURE_RAPPORT_DE_VISITE === $documentType && null !== $intervention) {
+            $isVisibleUsager = true;
+            if ($nbDocs > 0) {
+                $description .= sprintf(
+                    '%s a ajouté %s %s de la visite du %s :',
+                    $user->getPartner()->getNom(),
+                    $nbDocs,
+                    $nbDocs > 1 ? ' rapports de visite' : ' rapport de visite',
+                    $intervention->getScheduledAt()->format('d/m/Y')
+                );
+            }
         }
+
+        if (DocumentType::PHOTO_VISITE === $documentType) {
+            $isVisibleUsager = true;
+            if ($nbPhotos > 0) {
+                $description .= sprintf(
+                    '%s a ajouté %s %s de la visite du %s :',
+                    $user->getPartner()->getNom(),
+                    $nbPhotos,
+                    $nbPhotos > 1 ? ' photos' : ' photo',
+                    $intervention->getScheduledAt()->format('d/m/Y')
+                );
+            }
+        }
+
         $descriptionList = [];
         foreach ($files as $file) {
-            $fileUrl = $this->urlGenerator->generate('show_uploaded_file', ['folder' => '_up', 'filename' => $file->getFilename()]);
-            $descriptionList[] = '<li><a class="fr-link" target="_blank" href="'.$fileUrl.'">'.$file->getTitle().'</a></li>';
+            $fileUrl = $this->urlGenerator->generate(
+                'show_uploaded_file',
+                ['filename' => $file->getFilename()],
+                UrlGeneratorInterface::ABSOLUTE_URL
+            ).'?t=___TOKEN___';
+
+            $linkFile = '<li><a class="fr-link" target="_blank" href="'.$fileUrl.'">'.$file->getTitle().'</a>';
+            if (DocumentType::PHOTO_SITUATION === $file->getDocumentType() && null !== $file->getDesordreSlug()) {
+                $desordreCritere = $this->desordreCritereRepository->findOneBy(
+                    ['slugCritere' => $file->getDesordreSlug()]
+                );
+                if (null !== $desordreCritere) {
+                    $linkFile .= ' ('.$desordreCritere->getLabelCritere().')';
+                }
+            }
+            $linkFile .= '</li>';
+            $descriptionList[] = $linkFile;
         }
 
         $suivi = $this->suiviFactory->createInstanceFrom($user, $signalement);
@@ -111,6 +184,9 @@ public function createInstanceForFilesSignalement(User $user, Signalement $signa
             .implode('', $descriptionList)
             .'</ul>'
         );
+
+        $suivi->setIsPublic($isVisibleUsager);
+
         $suivi->setType(SUIVI::TYPE_AUTO);
 
         return $suivi;
diff --git a/src/Security/Voter/InterventionVoter.php b/src/Security/Voter/InterventionVoter.php
index 75797ded0..ae448227b 100755
--- a/src/Security/Voter/InterventionVoter.php
+++ b/src/Security/Voter/InterventionVoter.php
@@ -39,7 +39,10 @@ protected function voteOnAttribute(string $attribute, $subject, TokenInterface $
     public function canEditVisite(Intervention $intervention, User $user): bool
     {
         $signalement = $intervention->getSignalement();
-        if (Signalement::STATUS_ACTIVE !== $signalement->getStatut() && Signalement::STATUS_NEED_PARTNER_RESPONSE !== $signalement->getStatut()) {
+        if (
+            Signalement::STATUS_ACTIVE !== $signalement->getStatut() &&
+            Signalement::STATUS_NEED_PARTNER_RESPONSE !== $signalement->getStatut()
+        ) {
             return false;
         }
 
diff --git a/src/Service/Signalement/PhotoHelper.php b/src/Service/Signalement/PhotoHelper.php
new file mode 100644
index 000000000..35a383561
--- /dev/null
+++ b/src/Service/Signalement/PhotoHelper.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Service\Signalement;
+
+use App\Entity\Enum\DocumentType;
+use App\Entity\File;
+use App\Entity\Signalement;
+
+class PhotoHelper
+{
+    public static function getPhotosBySlug(Signalement $signalement, string $desordrePrecisionSlug): ?array
+    {
+        $photos = $signalement->getPhotos()->filter(function (File $file) use ($desordrePrecisionSlug) {
+            return DocumentType::PHOTO_SITUATION === $file->getDocumentType()
+            && $file->getDesordreSlug() === $desordrePrecisionSlug;
+        });
+
+        return $photos->toArray();
+    }
+
+    public static function getSortedPhotos(Signalement $signalement): ?array
+    {
+        $photoList = $signalement->getPhotos()->toArray();
+        $photoListByType = [
+            DocumentType::PHOTO_SITUATION->value => [],
+            DocumentType::PHOTO_VISITE->value => [],
+            DocumentType::AUTRE->value => [],
+        ];
+
+        foreach ($photoList as $photoItem) {
+            $type = $photoItem->getDocumentType();
+            $photoListByType[$type->value][] = $photoItem;
+        }
+
+        foreach ($photoListByType as &$photoArray) {
+            usort($photoArray, function (File $fileA, File $fileB) {
+                if (DocumentType::PHOTO_SITUATION === $fileA->getDocumentType()) {
+                    return $fileA->getId() <=> $fileB->getId();
+                }
+                if (DocumentType::PHOTO_VISITE === $fileA->getDocumentType()) {
+                    $interventionA = $fileA->getIntervention();
+                    $interventionB = $fileB->getIntervention();
+                    if (null === $interventionA && null === $interventionB) {
+                        return 0;
+                    }
+                    if (null === $interventionA) {
+                        return 1;
+                    }
+                    if (null === $interventionB) {
+                        return -1;
+                    }
+
+                    return $interventionA->getId() <=> $interventionB->getId();
+                }
+
+                return $fileA->getId() <=> $fileB->getId();
+            });
+        }
+
+        return array_merge(
+            $photoListByType[DocumentType::PHOTO_SITUATION->value],
+            $photoListByType[DocumentType::AUTRE->value],
+            $photoListByType[DocumentType::PHOTO_VISITE->value]
+        );
+    }
+}
diff --git a/src/Service/Signalement/SignalementDesordresProcessor.php b/src/Service/Signalement/SignalementDesordresProcessor.php
index e8a1a1255..41feeca4b 100644
--- a/src/Service/Signalement/SignalementDesordresProcessor.php
+++ b/src/Service/Signalement/SignalementDesordresProcessor.php
@@ -67,7 +67,7 @@ private function addPhotoBySlug(
         }
 
         $photos[$key] = array_unique(
-            array_merge($photos[$key], $this->signalementManager->getPhotosBySlug($signalement, $slug)),
+            array_merge($photos[$key], PhotoHelper::getPhotosBySlug($signalement, $slug)),
             \SORT_REGULAR
         );
     }
diff --git a/templates/_partials/_modal_upload_files.html.twig b/templates/_partials/_modal_upload_files.html.twig
index a693df3e8..70d56b6f2 100644
--- a/templates/_partials/_modal_upload_files.html.twig
+++ b/templates/_partials/_modal_upload_files.html.twig
@@ -22,17 +22,28 @@
                     </div>
                     <div class="fr-modal__content">
                         <div class="type-conditional type-document">
-                            <h1 class="fr-modal__title">
-                                Ajouter des documents partenaires
-                            </h1>
-                            <div>
-                                Ajouter un ou plusieurs documents. Pour chaque document, veuillez renseigner son type.
+                            <div class="filter-conditional filter-procedure">
+                                <h1 class="fr-modal__title">
+                                    Ajouter des documents liés à la procédure
+                                </h1>
+                                <div>
+                                    Ajouter un ou plusieurs documents. Pour chaque document, veuillez renseigner son type.
+                                </div>
+                                <div class="fr-alert fr-alert--info fr-alert--sm">
+                                    <p>Pour ajouter des documents de type Bail, DPE, Diagnostic et Etat des lieux, rendez-vous dans la partie "Déclaration usager".</p>
+                                </div>
                             </div>
-                            {#
-                            <div class="fr-alert fr-alert--info fr-alert--sm">
-                                <p>Pour ajouter des documents de type Bail, DPE, Diagnostic et Etat des lieux, rendez-vous dans la partie "Déclaration usager".</p>
+                            <div class="filter-conditional filter-situation">
+                                <h1 class="fr-modal__title">
+                                    Ajouter des documents liés à la situation
+                                </h1>
+                                <div>
+                                    Ajouter un ou plusieurs documents. Pour chaque document, veuillez renseigner son type.
+                                </div>
+                                <div class="fr-alert fr-alert--warning fr-alert--sm">
+                                    <p>Ces photos seront partagées à l'usager.</p>
+                                </div>
                             </div>
-                            #}
                         </div>
                         <div class="type-conditional type-photo">
                             <h1 class="fr-modal__title">
@@ -61,9 +72,15 @@
                         </div>
                         <div style="display:none">
                             {% set DocumentType = enum('\\App\\Entity\\Enum\\DocumentType') %}
-                            <select class="fr-select select-type" data-file-id="" id="select-type-to-clone">
+                            <select class="fr-select select-type" data-file-id="" id="select-type-situation-to-clone">
+                                <option value="">Sélectionner un type</option>
+                                {% for key, value in DocumentType.getSituationList() %}
+                                    <option value="{{ key }}">{{ value }}</option>
+                                {% endfor %}
+                            </select>
+                            <select class="fr-select select-type" data-file-id="" id="select-type-procedure-to-clone">
                                 <option value="">Sélectionner un type</option>
-                                {% for key, value in DocumentType.getDocumentsList() %}
+                                {% for key, value in DocumentType.getProcedureList() %}
                                     <option value="{{ key }}">{{ value }}</option>
                                 {% endfor %}
                             </select>
diff --git a/templates/back/signalement/view.html.twig b/templates/back/signalement/view.html.twig
index 2cfbf59d3..f01f6c143 100755
--- a/templates/back/signalement/view.html.twig
+++ b/templates/back/signalement/view.html.twig
@@ -41,36 +41,25 @@
         
         {% include 'back/signalement/view/user-declaration.html.twig' %}
 
-        {% if createdFromDraft %}
-            {% include 'back/signalement/view/photos-documents.html.twig' with {
-                'zonetitle': "Photos et documents de la situation",
-                'importedBy': "user"
-            } %}
-        {% endif %}
+        {% include 'back/signalement/view/photos-documents.html.twig' with {
+            'zonetitle': "Photos et documents de la situation",
+            'filesFilter': 'situation' 
+        } %}
     
         {% include 'back/signalement/view/information.html.twig' %}
         
         {% include 'back/signalement/view/nde.html.twig' %}
-
-        {% if not createdFromDraft %}
-            {% include 'back/signalement/view/photos-documents.html.twig' with {
-                'zonetitle': "Photos et documents",
-                'importedBy': "all"
-            } %}
-        {% endif %}
-        
+ 
         {% include 'back/signalement/view/partners.html.twig' %}
         
         {% include 'back/signalement/view/suivis.html.twig' %}
 
         {% include 'back/signalement/view/visites/visites-list.html.twig' %}
 
-        {% if createdFromDraft %}
-            {% include 'back/signalement/view/photos-documents.html.twig' with {
-                'zonetitle': "Photos et documents liés à la procédure",
-                'importedBy': "partner"
-            } %}
-        {% endif %}
+        {% include 'back/signalement/view/photos-documents.html.twig' with {
+            'zonetitle': "Documents liés à la procédure",
+            'filesFilter': 'procedure' 
+        } %}
     </section>
 {% endblock %}
 {% block javascripts %}
diff --git a/templates/back/signalement/view/edit-modals/edit-file.html.twig b/templates/back/signalement/view/edit-modals/edit-file.html.twig
index 817453102..b082408d5 100755
--- a/templates/back/signalement/view/edit-modals/edit-file.html.twig
+++ b/templates/back/signalement/view/edit-modals/edit-file.html.twig
@@ -18,8 +18,8 @@
                                     <b><span class="fr-modal-file-edit-filename"></span></b>
                                     <br>
                                     <span class="fr-modal-file-edit-infos"></span>             
-                                </div>               
-                            </div>
+                                </div>          
+                            </div> 
 
                             <div class="fr-select-group">
                                  <select class="fr-select" name="documentType" id="document-type-select">
@@ -30,6 +30,11 @@
                                  <select class="fr-select fr-hidden" name="desordreSlug" id="desordre-slug-select">
                                 </select>
                             </div>
+
+                            <div id="fr-modal-edit-file-description" class="fr-input-group fr-hidden fr-col-12  fr-mb-2w">
+                                <label class="fr-label" for="fileDescription">Description : </label>
+                                    <input class="fr-input" type="text" id="fileDescription" name="description">
+                            </div>    
                         </div>
                         
                         <div class="fr-modal__footer">
diff --git a/templates/back/signalement/view/photos-album.html.twig b/templates/back/signalement/view/photos-album.html.twig
index d501fe7f2..25b626ab2 100755
--- a/templates/back/signalement/view/photos-album.html.twig
+++ b/templates/back/signalement/view/photos-album.html.twig
@@ -2,17 +2,16 @@
     <div class="photos-album-close-button-container">
         <button class="photos-album-btn-close fr-btn">Fermer</button>
     </div>
-
-    {% set loopLength = signalement.files|filter( photo => photo.fileType == 'photo' and photo.intervention is null )|length %}
+    {% set loopLength = allPhotosOrdered|length %}
     <div class="photos-album-navigation-container">
         <div>
             <button class="fr-btn photos-album-swipe" data-direction="-1">&lt;</button>
         </div>
         <div>
-            {% for index, photo in signalement.files|filter( photo => photo.fileType == 'photo' and photo.intervention is null ) %}
+            {% for index, photo in allPhotosOrdered %}
             <div class="photos-album-image-item {{ loop.index > 1 ? 'fr-hidden' : 'loop-current' }}" data-id="{{ photo.id }}">
                 <div>
-                    Photo de la situation - {{ loop.index }} / {{ loopLength }}
+                    {{ photo.documentType.label}} - {{ loop.index }} / {{ loopLength }}
                 </div>
                 <div>
                     <img
@@ -26,11 +25,17 @@
                         {% if photo.documentType is same as enum('App\\Entity\\Enum\\DocumentType').PHOTO_SITUATION
                                 and photo.desordreSlug is not same as null %}
                             {{ signalement.getDesordreLabel(photo.desordreSlug) }}
+                        {% elseif photo.documentType is same as enum('App\\Entity\\Enum\\DocumentType').PHOTO_VISITE %}
+                            {{ photo.documentType.label() }} du {{ photo.intervention.scheduledAt|date('d/m/Y') }} par {{ photo.intervention.partner.nom}}
                         {% else %}
                             {{ photo.documentType.label() }}
                         {% endif %}
                         <br>
                     {% endif %}
+                    {% if photo.description is not same as null %}
+                        {{ photo.description }}
+                    {% endif %}
+                    <br>
                     Photo ajoutée par {{ photo.uploadedBy.nomComplet ?? 'l\'usager' }}
                 </div>
             </div>
@@ -42,8 +47,8 @@
     </div>
     <script type="text/javascript">
         const histoPhotoIds = []
-        {% for index, photo in signalement.files|filter( photo => photo.fileType == 'photo' and photo.intervention is null ) %}
-            histoPhotoIds.push({{photo.id}})
+        {% for index, photo in allPhotosOrdered %}
+            histoPhotoIds.push({{ photo.id }})
         {% endfor %}
     </script>
 </div>
diff --git a/templates/back/signalement/view/photos-documents.html.twig b/templates/back/signalement/view/photos-documents.html.twig
index 649498a39..7ee5b9b13 100755
--- a/templates/back/signalement/view/photos-documents.html.twig
+++ b/templates/back/signalement/view/photos-documents.html.twig
@@ -1,35 +1,41 @@
-{% if importedBy is not same as 'user' %}
-    <hr class="fr-mt-3w">
+<hr class="fr-mt-3w">
 
-    <div class="fr-grid-row">
-        <div class="fr-col-9 fr-col-md-6">
-            <h3 class="fr-h5">{{ zonetitle }}</h3>
-        </div>
-        <div class="fr-col-3 fr-col-md-6 fr-text--right">
-            {% if (is_granted('FILE_CREATE', signalement)) %}
-                {% if isDocumentsEnabled %}
-                    <button 
-                    class="fr-btn fr-btn--sm fr-fi-file-fill fr-btn--icon-left open-modal-upload-files-btn" 
-                    data-fr-opened="false" 
-                    aria-controls="fr-modal-upload-files" 
-                    data-file-type="document">
-                        Ajouter des documents
-                    </button>
+<div class="fr-grid-row">
+    <div class="fr-col-9 fr-col-md-6">
+        <h3 class="fr-h5">{{ zonetitle }}</h3>
+    </div>
+    <div class="fr-col-3 fr-col-md-6 fr-text--right">
+        {% if (is_granted('FILE_CREATE', signalement)) %}
+            {% if isDocumentsEnabled %}
+                <button 
+                class="fr-btn fr-btn--sm fr-fi-file-fill fr-btn--icon-left open-modal-upload-files-btn" 
+                data-fr-opened="false" 
+                aria-controls="fr-modal-upload-files" 
+                data-file-type="document"
+                data-file-filter={{filesFilter}}
+                >
+                    Ajouter des documents
+                </button>
+                {% if filesFilter is same as 'situation' %}
                     <button 
                     class="fr-btn fr-btn--sm fr-btn--secondary fr-btn--icon-left fr-icon-camera-fill open-modal-upload-files-btn" 
                     data-fr-opened="false" 
                     aria-controls="fr-modal-upload-files" 
-                    data-file-type="photo">
+                    data-file-type="photo"
+                    data-file-filter={{filesFilter}}
+                    >
                         Ajouter des photos
                     </button>
-                {% else %}
-                    <form method="POST" enctype="multipart/form-data" class="inline-form" action="{{ path('back_signalement_add_file',{uuid:signalement.uuid}) }}">
-                        <label class="fr-btn fr-btn--sm fr-fi-file-fill fr-btn--icon-left"> Ajouter des documents
-                            <input type="file" accept="application/*" name="signalement-add-file[documents][]" class="fr-hidden fr-input--file-signalement" multiple>
-                        </label>
-                        <input type="hidden" name="_token" value="{{ csrf_token('signalement_add_file_'~signalement.id) }}">
-                        <input type="hidden" name="document_type" value="{{ enum('App\\Entity\\Enum\\DocumentType').AUTRE.name }}">
-                    </form>
+                {% endif %}
+            {% else %}
+                <form method="POST" enctype="multipart/form-data" class="inline-form" action="{{ path('back_signalement_add_file',{uuid:signalement.uuid}) }}">
+                    <label class="fr-btn fr-btn--sm fr-fi-file-fill fr-btn--icon-left"> Ajouter des documents
+                        <input type="file" accept="application/*" name="signalement-add-file[documents][]" class="fr-hidden fr-input--file-signalement" multiple>
+                    </label>
+                    <input type="hidden" name="_token" value="{{ csrf_token('signalement_add_file_'~signalement.id) }}">
+                    <input type="hidden" name="document_type" value="{{ enum('App\\Entity\\Enum\\DocumentType').AUTRE.name }}">
+                </form>
+                {% if filesFilter is same as 'situation' %}
                     <form method="POST" enctype="multipart/form-data" class="inline-form" action="{{ path('back_signalement_add_file',{uuid:signalement.uuid}) }}">
                         <label class="fr-btn fr-btn--sm fr-btn--secondary fr-btn--icon-left fr-icon-camera-fill"> Ajouter des photos
                             <input type="file" accept="image/*" name="signalement-add-file[photos][]" class="fr-hidden fr-input--file-signalement" multiple>
@@ -38,20 +44,19 @@
                         <input type="hidden" name="document_type" value="{{ enum('App\\Entity\\Enum\\DocumentType').AUTRE.name }}">
                     </form>
                 {% endif %}
-                
-
             {% endif %}
-        </div>
+            
+
+        {% endif %}
     </div>
+</div>
 
+{% if filesFilter is same as 'situation' %}
     <div class="fr-alert fr-alert--info fr-alert--sm fr-mb-3v">
         <p>
             Pour ajouter plusieurs photos ou documents à la fois, sélectionnez vos fichiers en maintenant la touche CTRL enfoncée.
         </p>
     </div>
-
-{% else %}
-    <h3 class="fr-h6">{{ zonetitle }}</h3>
 {% endif %}
 
 {% if signalement.files|length == 0 %}
@@ -60,68 +65,69 @@
     </p>
 {% endif %}
 
-<div class="fr-grid-row fr-grid-row--middle fr-grid-row--gutters fr-mb-3v">
-    {% for index, photo in signalement.files|filter(
-        photo => photo.fileType == 'photo'
-                and photo.intervention is null
-                and (
-                    (importedBy is same as 'user' and (photo.uploadedBy is null or photo.isUsagerFile ))
-                    or (importedBy is same as 'partner' and (photo.uploadedBy is not null and photo.isPartnerFile))
-                    or importedBy is same as 'all'
-                )
-        ) %}
-        <div class="fr-col-6 fr-col-md-2 fr-rounded signalement-file-item">
-            <div class="fr-px-5w fr-py-8w fr-rounded fr-border fr-text--center part-infos-hover"
-                 data-user="{{ photo.uploadedBy.nomComplet ?? 'N/R' }}"
-                 data-mail="{{ photo.createdAt is defined ? photo.createdAt|date('d.m.Y') : 'N/R' }}"
-                 style="background: url('{{ asset('_up/'~photo.filename~'/'~signalement.uuid~'?variant=thumb') }}')no-repeat center center/cover">
-                <button 
-                    class="fr-btn fr-btn--sm fr-icon-eye-line open-photo-album" 
-                    data-id={{ photo.id }} 
-                    title="Voir la photo {{ photo.filename }}"
-                ></button>
-                {% if is_granted('FILE_EDIT', photo) %}
-                    {% set DocumentType = enum('\\App\\Entity\\Enum\\DocumentType') %}
-                    {% include 'back/signalement/view/edit-modals/edit-file.html.twig' %}
-                    <button 
-                        class="fr-btn fr-btn--sm fr-btn--secondary fr-background--white fr-fi-edit-line btn-signalement-file-edit"
-                        id="file_edit_{{ photo.id }}" 
-                        title="Editer la photo {{ photo.filename }}"
-                        aria-controls="fr-modal-edit-file"
-                        data-fr-opened="false" 
-                        data-filename="{{ photo.filename }}" 
-                        data-type="photo" 
-                        data-file-id="{{ photo.id}}" 
-                        data-signalement-uuid="{{ signalement.uuid}}" 
-                        data-documentType="{{ photo.documentType.name }}" 
-                        data-documentType-list="{{ DocumentType.getPhotosList() | json_encode }}"
-                        data-createdAt="{{ photo.createdAt is defined ? photo.createdAt|date('d.m.Y') : 'N/R' }}"
-                        data-partner-name="{{ photo.uploadedBy and photo.uploadedBy.partner ? photo.uploadedBy.partner.nom ~ ' - ' : '' }}"
-                        data-user-name="{{ photo.uploadedBy.nomComplet ?? 'N/R' }}"
-                        data-desordreSlug="{{ photo.desordreSlug }}"
-                        data-signalement-desordres="{{ criteres | json_encode }}"
-                    ></button>
-                {% endif %}
-                {% if is_granted('FILE_DELETE', photo) %}
+
+{% set DocumentType = enum('\\App\\Entity\\Enum\\DocumentType') %}
+{% if filesFilter is same as 'situation' %}
+    <div class="fr-grid-row fr-grid-row--middle fr-grid-row--gutters fr-mb-3v">
+        {% for index, photo in signalement.files|filter(
+            photo => photo.isSituationPhoto
+                    and filesFilter is same as 'situation' 
+            ) %}
+            <div class="fr-col-6 fr-col-md-2 fr-rounded signalement-file-item">
+                <div class="fr-px-5w fr-py-8w fr-rounded fr-border fr-text--center part-infos-hover"
+                    data-user="{{ photo.uploadedBy.nomComplet ?? 'N/R' }}"
+                    data-mail="{{ photo.createdAt is defined ? photo.createdAt|date('d.m.Y') : 'N/R' }}"
+                    style="background: url('{{ asset('_up/'~photo.filename~'/'~signalement.uuid~'?variant=thumb') }}')no-repeat center center/cover">
                     <button 
-                        title="Supprimer la photo {{ photo.filename }}"
-                        data-delete="{{ path('back_signalement_delete_file',{uuid:signalement.uuid,type:'photos',filename:photo.filename}) }}"
-                        data-token="{{ csrf_token('signalement_delete_file_'~signalement.id) }}"
-                        class="fr-btn fr-btn--sm fr-btn--secondary fr-background--white fr-fi-delete-line signalement-file-delete"
+                        class="fr-btn fr-btn--sm fr-icon-eye-line open-photo-album" 
+                        data-id={{ photo.id }} 
+                        title="Voir la photo {{ photo.filename }}"
                     ></button>
-                {% endif %}
+                    {% if is_granted('FILE_EDIT', photo) %}
+                        {% include 'back/signalement/view/edit-modals/edit-file.html.twig' %}
+                        <button 
+                            class="fr-btn fr-btn--sm fr-btn--secondary fr-background--white fr-fi-edit-line btn-signalement-file-edit"
+                            id="file_edit_{{ photo.id }}" 
+                            title="Editer la photo {{ photo.filename }}"
+                            aria-controls="fr-modal-edit-file"
+                            data-fr-opened="false" 
+                            data-filename="{{ photo.filename }}" 
+                            data-type="photo" 
+                            data-file-id="{{ photo.id}}" 
+                            data-signalement-uuid="{{ signalement.uuid}}" 
+                            data-description="{{ photo.description }}" 
+                            data-documentType="{{ photo.documentType.name }}" 
+                            data-documentType-list="{{ DocumentType.getPhotosList() | json_encode }}"
+                            data-createdAt="{{ photo.createdAt is defined ? photo.createdAt|date('d.m.Y') : 'N/R' }}"
+                            data-partner-name="{{ photo.uploadedBy and photo.uploadedBy.partner ? photo.uploadedBy.partner.nom ~ ' - ' : '' }}"
+                            data-user-name="{{ photo.uploadedBy.nomComplet ?? 'N/R' }}"
+                            data-desordreSlug="{{ photo.desordreSlug }}"
+                            data-signalement-desordres="{{ criteres | json_encode }}"
+                        ></button>
+                    {% endif %}
+                    {% if is_granted('FILE_DELETE', photo) %}
+                        <button 
+                            title="Supprimer la photo {{ photo.filename }}"
+                            data-delete="{{ path('back_signalement_delete_file',{uuid:signalement.uuid,type:'photos',filename:photo.filename}) }}"
+                            data-token="{{ csrf_token('signalement_delete_file_'~signalement.id) }}"
+                            class="fr-btn fr-btn--sm fr-btn--secondary fr-background--white fr-fi-delete-line signalement-file-delete"
+                        ></button>
+                    {% endif %}
+                </div>
             </div>
-        </div>
-    {% endfor %}
-</div>
+        {% endfor %}
+    </div>
+{% endif %}
 
 {% for index, doc in signalement.files|filter(
     doc => doc.fileType == 'document'
-            and (
-                (importedBy is same as 'user' and (doc.uploadedBy is null or doc.isUsagerFile ))
-                or (importedBy is same as 'partner' and (doc.uploadedBy is not null and doc.isPartnerFile))
-                or importedBy is same as 'all'
-            )
+        and (
+            (filesFilter is same as 'situation' 
+            and doc.documentType.label() in  DocumentType.getSituationList)
+            or 
+            (filesFilter is same as 'procedure' 
+            and doc.documentType.label() in  DocumentType.getProcedureList)
+        )
     ) %}
     <div class="fr-grid-row fr-grid-row--middle fr-background-alt--grey fr-rounded fr-p-3v signalement-file-item">
         <div class="fr-col-9">
@@ -139,7 +145,7 @@
                     {% if doc.intervention is null %}
                     <i>{{ doc.title|truncate_filename(45) }}</i>
                     {% else %}
-                    <i>Rapport de visite du {{ doc.intervention.scheduledAt|date('d/m/Y') }}</i>
+                    <i>Rapport de la visite du {{ doc.intervention.scheduledAt|date('d/m/Y') }} par {{ doc.intervention.partner.nom}}</i>
                     {% endif %}
                 </div>
             </div>
@@ -160,7 +166,7 @@
                     data-type="document" 
                     data-file-id="{{ doc.id}}" 
                     data-documentType="{{ doc.documentType.name }}" 
-                    data-documentType-list="{{ DocumentType.getDocumentsList() | json_encode }}"
+                    data-documentType-list="{{ filesFilter is same as 'situation' ? DocumentType.getSituationList() | json_encode : DocumentType.getProcedureList() | json_encode }}"
                     data-createdAt="{{ doc.createdAt is defined ? doc.createdAt|date('d.m.Y') : 'N/R' }}"
                     data-partner-name="{{ doc.uploadedBy and doc.uploadedBy.partner ? doc.uploadedBy.partner.nom ~ ' - ' : '' }}"
                     data-user-name="{{ doc.uploadedBy.nomComplet ?? 'N/R' }}"
diff --git a/templates/back/signalement/view/visites/modals/visites-modal-upload-files.html.twig b/templates/back/signalement/view/visites/modals/visites-modal-upload-files.html.twig
new file mode 100644
index 000000000..d049ec077
--- /dev/null
+++ b/templates/back/signalement/view/visites/modals/visites-modal-upload-files.html.twig
@@ -0,0 +1,65 @@
+<dialog 
+    aria-labelledby="fr-modal-visites-upload-files-{{intervention.id}}" 
+    id="visites-upload-files-{{intervention.id}}" 
+    class="fr-modal fr-modal-visites-upload-files" 
+    role="dialog" 
+    data-file-type="document"
+    data-intervention-id="{{intervention.id}}"
+    data-has-changes="false"
+    data-validated="false"
+    data-add-file-route="{{ path('back_signalement_add_file',{uuid:signalement.uuid}) }}"
+    data-add-file-token="{{ csrf_token('signalement_add_file_'~signalement.id) }}"
+    data-edit-file-route="{{ path('back_signalement_edit_file',{uuid:signalement.uuid}) }}"
+    data-edit-file-token="{{ csrf_token('signalement_edit_file_'~signalement.id) }}"
+    data-delete-tmp-file-route="{{ path('back_signalement_delete_tmpfile',{id:'REPLACE'}) }}"
+    data-waiting-suivi-route="{{ path('back_signalement_file_waiting_suivi',{uuid:signalement.uuid}) }}"
+    >
+    <div class="fr-container fr-container--fluid fr-container-md">
+        <div class="fr-grid-row fr-grid-row--center">
+            <div class="fr-col-12 fr-col-md-8">
+                <div class="fr-modal__body">
+                    <div class="fr-modal__header">
+                        <button class="fr-btn--close fr-btn" aria-controls="visites-upload-files-{{intervention.id}}">Fermer</button>
+                    </div>
+                    <div class="fr-modal__content">
+                        <div class="type-conditional type-photo">
+                            <h1 class="fr-modal__title">
+                                Ajout des photos de la visite
+                            </h1>
+                            <div>
+                                Ajouter une ou plusieurs photos au signalement. 
+                            </div>
+                            <div class="fr-alert fr-alert--warning fr-alert--sm">
+                                <p>Les photos seront partagées à l'usager.</p>
+                            </div>
+                        </div>
+                        <div class="modal-upload-upload-container fr-mb-4w">
+                            <div class="modal-upload-drop-section">
+                                <span class="fr-icon-upload-2-line fr-icon--lg fr-text-label--blue-france"></span>
+                                <div class="modal-upload-drop-section-label fr-mt-1w">
+                                    Faites glisser vos documents ici
+                                </div>
+                            </div>
+                            <p class="fr-mb-1w">ou</p>
+                            <button class="modal-upload-files-selector fr-btn fr-icon-search-line fr-btn--icon-left fr-btn--secondary">Parcourir les fichiers de l'appareil</button>
+                            <input type="file" class="modal-upload-files-selector-input" multiple accept="application/*">
+                        </div>
+                        <div class="modal-upload-list-section" id="modal-upload-file-dynamic-content">
+                            <div class="modal-upload-list"></div>
+                        </div>
+                    </div>
+                    <div class="fr-modal__footer">
+                        <div class="fr-btns-group fr-btns-group--right fr-btns-group--inline-lg fr-btns-group--icon-left">
+                            <button class="fr-btn fr-btn--secondary fr-icon-close-line" aria-controls="visites-upload-files-{{intervention.id}}">
+                                Annuler
+                            </button>
+                            <button class="fr-btn fr-icon-check-line" aria-controls="visites-upload-files-{{intervention.id}}" id="btn-validate-modal-upload-files">
+                                Valider
+                            </button>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</dialog>
\ No newline at end of file
diff --git a/templates/back/signalement/view/visites/modals/visites-modals.html.twig b/templates/back/signalement/view/visites/modals/visites-modals.html.twig
index 7b2a5ab4c..6562b5b99 100755
--- a/templates/back/signalement/view/visites/modals/visites-modals.html.twig
+++ b/templates/back/signalement/view/visites/modals/visites-modals.html.twig
@@ -9,5 +9,8 @@
         {% include 'back/signalement/view/visites/modals/visites-modal-reschedule.html.twig' %}
     {% elseif intervention.status is same as constant('App\\Entity\\Intervention::STATUS_DONE') %}
         {% include 'back/signalement/view/visites/modals/visites-modal-edit.html.twig' %}
+        {% if (is_granted('FILE_CREATE', signalement) and  isDocumentsEnabled) %}
+            {% include 'back/signalement/view/visites/modals/visites-modal-upload-files.html.twig' %}
+        {% endif %}
     {% endif %}
 {% endif %}
\ No newline at end of file
diff --git a/templates/back/signalement/view/visites/visite-item.html.twig b/templates/back/signalement/view/visites/visite-item.html.twig
index 2662a36a5..0fd692083 100755
--- a/templates/back/signalement/view/visites/visite-item.html.twig
+++ b/templates/back/signalement/view/visites/visite-item.html.twig
@@ -60,20 +60,6 @@
                 {% endif %}
             {% endif %}
         </div>
-        <div class="fr-mb-3v fr-display-inline-flex">
-            <strong>Rapport : </strong>
-            {% if signalement.interventions is empty or intervention.files is empty %}
-                <span class="fr-badge fr-badge--no-icon" title="Non disponible">Non disponible</span> 
-            {% else %}
-                <a href="{{ asset('_up/'~intervention.files[0].filename)~'/' ~ signalement.uuid }}"
-                    class="fr-btn fr-btn--sm"
-                    title="Afficher le document"
-                    rel="noopener"
-                    target="_blank">
-                    <span aria-hidden="true" class="fr-fi-file-line fr-icon--sm"></span> Voir le rapport de visite
-                </a>
-            {% endif %}
-        </div>
     </div>
     <div class="fr-col-12">
         <strong>Commentaire du partenaire :</strong>
@@ -88,3 +74,47 @@
         </div>
     </div>
 </div>
+
+<div class="fr-grid-row fr-grid-row--middle fr-grid-row--gutters fr-mb-3v">
+    {% for index, photo in signalement.files|filter(
+        photo => photo.fileType == 'photo'
+                and photo.intervention is not null
+                and photo.intervention.id is same as intervention.id
+        ) %}
+        <div class="fr-col-6 fr-col-md-2 fr-rounded signalement-file-item">
+            <div class="fr-px-5w fr-py-8w fr-rounded fr-border fr-text--center part-infos-hover"
+                 data-user="{{ photo.uploadedBy.nomComplet ?? 'N/R' }}"
+                 data-mail="{{ photo.createdAt is defined ? photo.createdAt|date('d.m.Y') : 'N/R' }}"
+                 style="background: url('{{ asset('_up/'~photo.filename~'/'~signalement.uuid~'?variant=thumb') }}')no-repeat center center/cover">
+                <button 
+                    class="fr-btn fr-btn--sm fr-icon-eye-line open-photo-album" 
+                    data-id={{ photo.id }} 
+                    title="Voir la photo {{ photo.filename }}"
+                ></button>
+                {% if is_granted('FILE_EDIT', photo) %}
+                    {% set DocumentType = enum('\\App\\Entity\\Enum\\DocumentType') %}
+                    {% include 'back/signalement/view/edit-modals/edit-file.html.twig' %}
+                    <button 
+                        class="fr-btn fr-btn--sm fr-btn--secondary fr-background--white fr-fi-edit-line btn-signalement-file-edit"
+                        id="file_edit_{{ photo.id }}" 
+                        title="Editer la photo {{ photo.filename }}"
+                        aria-controls="fr-modal-edit-file"
+                        data-fr-opened="false" 
+                        data-filename="{{ photo.filename }}" 
+                        data-type="photo" 
+                        data-file-id="{{ photo.id}}" 
+                        data-signalement-uuid="{{ signalement.uuid}}" 
+                        data-description="{{ photo.description }}" 
+                        data-documentType="{{ photo.documentType.name }}" 
+                        data-documentType-list="{{ DocumentType.getPhotosList() | json_encode }}"
+                        data-createdAt="{{ photo.createdAt is defined ? photo.createdAt|date('d.m.Y') : 'N/R' }}"
+                        data-partner-name="{{ photo.uploadedBy and photo.uploadedBy.partner ? photo.uploadedBy.partner.nom ~ ' - ' : '' }}"
+                        data-user-name="{{ photo.uploadedBy.nomComplet ?? 'N/R' }}"
+                        data-desordreSlug="{{ photo.desordreSlug }}"
+                        data-signalement-desordres="{{ criteres | json_encode }}"
+                    ></button>
+                {% endif %}
+            </div>
+        </div>
+    {% endfor %}
+</div>
diff --git a/templates/back/signalement/view/visites/visites-buttons.html.twig b/templates/back/signalement/view/visites/visites-buttons.html.twig
index 21b2e6e55..d9d8d66f0 100755
--- a/templates/back/signalement/view/visites/visites-buttons.html.twig
+++ b/templates/back/signalement/view/visites/visites-buttons.html.twig
@@ -1,26 +1,63 @@
-<div class="signalement-visites-buttons fr-text--right">
-    {% if signalement.interventions is empty %}
-        <button class="fr-btn fr-btn--sm fr-fi-calendar-line fr-btn--icon-left" aria-controls="add-visite-modal" data-fr-opened="false">
+<div class="signalement-visites-buttons fr-text--right fr-btns-group fr-btns-group--inline fr-btns-group--sm fr-btns-group--right fr-btns-group--icon-left">
+    {% if signalement.interventions is empty %} 
+        <button class="fr-btn fr-fi-calendar-line" aria-controls="add-visite-modal" data-fr-opened="false">
             Ajouter une visite
         </button>
-    {% elseif intervention.status is same as constant('App\\Entity\\Intervention::STATUS_PLANNED') %}
-        {% if workflow_can(intervention, 'cancel') %}
-            <button class="fr-btn fr-btn--sm fr-btn--danger fr-fi-close-line fr-btn--icon-left" aria-controls="cancel-visite-modal-{{intervention.id}}" data-fr-opened="false">
-                Annuler la visite
+    {% elseif intervention.status is same as constant('App\\Entity\\Intervention::STATUS_PLANNED') %}    
+        {% if is_granted('INTERVENTION_EDIT_VISITE', intervention) %}
+            {% if workflow_can(intervention, 'cancel') %}
+                <button class="fr-btn fr-btn--danger fr-fi-close-line" aria-controls="cancel-visite-modal-{{intervention.id}}" data-fr-opened="false">
+                    Annuler la visite
+                </button>
+            {% endif %}
+            <button class="fr-btn fr-btn--secondary fr-fi-edit-line" aria-controls="reschedule-visite-modal-{{intervention.id}}" data-fr-opened="false">
+                Modifier la date
             </button>
+            {% if workflow_can(intervention, 'confirm') %}
+                <button class="fr-btn fr-fi-check-line" aria-controls="confirm-visite-modal-{{intervention.id}}" data-fr-opened="false">
+                    Confirmer la visite
+                </button>
+            {% endif %}
         {% endif %}
-        <button class="fr-btn fr-btn--sm fr-btn--secondary fr-fi-edit-line fr-btn--icon-left" aria-controls="reschedule-visite-modal-{{intervention.id}}" data-fr-opened="false">
-            Modifier la date
-        </button>
-        {% if workflow_can(intervention, 'confirm') %}
-            <button class="fr-btn fr-btn--sm fr-fi-check-line fr-btn--icon-left" aria-controls="confirm-visite-modal-{{intervention.id}}" data-fr-opened="false">
-                Confirmer la visite
+    {% elseif intervention.status is same as constant('App\\Entity\\Intervention::STATUS_DONE') %}
+        {% if signalement.interventions is empty or intervention.files is empty or intervention.getRapportDeVisite is empty%}
+            {% if isDocumentsEnabled and is_granted('INTERVENTION_EDIT_VISITE', intervention) %}
+                <button 
+                    class="fr-btn fr-fi-file-fill"
+                    aria-controls="edit-visite-modal-{{intervention.id}}"  
+                    data-fr-opened="false"
+                    >
+                    Ajouter un rapport de visite
+                </button>
+            {% endif %}
+        {% else %}
+            {% if is_granted('INTERVENTION_EDIT_VISITE', intervention) %}
+                <button 
+                    class="fr-btn fr-btn--secondary fr-fi-edit-line" 
+                    aria-controls="edit-visite-modal-{{intervention.id}}" 
+                    data-fr-opened="false">
+                    Editer le rapport
+                </button>
+            {% endif %}
+            <a href="{{ asset('_up/'~intervention.getRapportDeVisite.first.filename)~'/' ~ signalement.uuid }}"
+                class="fr-btn"
+                title="Afficher le document"
+                rel="noopener"
+                target="_blank">
+                <span aria-hidden="true" class="fr-fi-file-line fr-icon--sm"></span> Voir le rapport de visite
+            </a>
+        {% endif %}
+        {% if isDocumentsEnabled and is_granted('INTERVENTION_EDIT_VISITE', intervention)%}
+            <button 
+                class="fr-btn fr-btn--secondary fr-icon-camera-fill open-modal-upload-files-btn" 
+                data-fr-opened="false" 
+                aria-controls="visites-upload-files-{{intervention.id}}"
+                data-file-type="photo"
+                data-document-type="PHOTO_VISITE"
+                data-intervention-id="{{intervention.id}}">
+                Ajouter les photos de la visite
             </button>
         {% endif %}
-    {% elseif intervention.status is same as constant('App\\Entity\\Intervention::STATUS_DONE') %}
-        <button class="fr-btn fr-btn--sm fr-btn--secondary fr-fi-edit-line fr-btn--icon-left" aria-controls="edit-visite-modal-{{intervention.id}}" data-fr-opened="false">
-            Editer le rapport
-        </button>
     {% else %}
         &nbsp;
     {% endif %}
diff --git a/templates/back/signalement/view/visites/visites-list.html.twig b/templates/back/signalement/view/visites/visites-list.html.twig
index c1f9fd602..2d6533df8 100755
--- a/templates/back/signalement/view/visites/visites-list.html.twig
+++ b/templates/back/signalement/view/visites/visites-list.html.twig
@@ -24,8 +24,8 @@
             <div class="fr-col-12 fr-col-md-6">
                 {% if is_granted('INTERVENTION_EDIT_VISITE', intervention) %}
                     {% include 'back/signalement/view/visites/modals/visites-modals.html.twig' %}
-                    {% include 'back/signalement/view/visites/visites-buttons.html.twig' %}
                 {% endif %}
+                {% include 'back/signalement/view/visites/visites-buttons.html.twig' %}
             </div>
         </div>
         {% include 'back/signalement/view/visites/visite-item.html.twig' %}
diff --git a/tests/Functional/Manager/SignalementManagerTest.php b/tests/Functional/Manager/SignalementManagerTest.php
index ad3634bfc..cd4894a73 100644
--- a/tests/Functional/Manager/SignalementManagerTest.php
+++ b/tests/Functional/Manager/SignalementManagerTest.php
@@ -5,7 +5,6 @@
 use App\Dto\Request\Signalement\CompositionLogementRequest;
 use App\Dto\Request\Signalement\QualificationNDERequest;
 use App\Entity\Affectation;
-use App\Entity\Enum\DocumentType;
 use App\Entity\Enum\MotifCloture;
 use App\Entity\Signalement;
 use App\Entity\SignalementQualification;
@@ -266,22 +265,6 @@ public function testUpdateFromEmptyCompositionLogementRequest(): void
         $this->assertStringContainsString('Merci de définir le nombre de pièces à vivre', $errorsAsString);
     }
 
-    public function testGetPhotosBySlug(): void
-    {
-        $signalement = $this->signalementManager->findOneBy(['reference' => '2023-27']);
-
-        $desordrePrecisionSlug = 'desordres_batiment_proprete_interieur';
-        $photos = $this->signalementManager->getPhotosBySlug($signalement, $desordrePrecisionSlug);
-        $this->assertCount(1, $photos);
-        $firstKey = array_keys($photos)[0];
-        $this->assertEquals(DocumentType::PHOTO_SITUATION, $photos[$firstKey]->getDocumentType());
-        $this->assertEquals('Capture-d-ecran-du-2023-06-13-12-58-43-648b2a6b9730f.png', $photos[$firstKey]->getTitle());
-
-        $desordrePrecisionSlug = 'desordres_batiment_isolation_murs';
-        $photos = $this->signalementManager->getPhotosBySlug($signalement, $desordrePrecisionSlug);
-        $this->assertCount(0, $photos);
-    }
-
     public function testUpdateFromSignalementQualificationWithNdeRequest(): void
     {
         /** @var Signalement $signalement */
diff --git a/tests/Functional/Manager/SuiviManagerTest.php b/tests/Functional/Manager/SuiviManagerTest.php
index a17760f45..cd9de5017 100644
--- a/tests/Functional/Manager/SuiviManagerTest.php
+++ b/tests/Functional/Manager/SuiviManagerTest.php
@@ -9,6 +9,7 @@
 use App\EventListener\SignalementUpdatedListener;
 use App\Factory\SuiviFactory;
 use App\Manager\SuiviManager;
+use App\Repository\DesordreCritereRepository;
 use App\Repository\SuiviRepository;
 use App\Repository\UserRepository;
 use Doctrine\Persistence\ManagerRegistry;
@@ -24,6 +25,7 @@ class SuiviManagerTest extends KernelTestCase
     private UrlGeneratorInterface $urlGenerator;
     private SignalementUpdatedListener $signalementUpdatedListener;
     private Security $security;
+    private DesordreCritereRepository $desordreCritereRepository;
 
     protected function setUp(): void
     {
@@ -33,6 +35,7 @@ protected function setUp(): void
         $this->urlGenerator = static::getContainer()->get(UrlGeneratorInterface::class);
         $this->signalementUpdatedListener = static::getContainer()->get(SignalementUpdatedListener::class);
         $this->security = static::getContainer()->get(Security::class);
+        $this->desordreCritereRepository = static::getContainer()->get(DesordreCritereRepository::class);
     }
 
     public function testCreateSuivi(): void
@@ -43,6 +46,7 @@ public function testCreateSuivi(): void
             $this->urlGenerator,
             $this->signalementUpdatedListener,
             $this->security,
+            $this->desordreCritereRepository,
             Suivi::class,
         );
 
@@ -78,6 +82,7 @@ public function testUpdateSuiviCreatedByUser(): void
             $this->urlGenerator,
             $this->signalementUpdatedListener,
             $this->security,
+            $this->desordreCritereRepository,
             Suivi::class,
         );
 
diff --git a/tests/Functional/Service/Signalement/PhotoHelperTest.php b/tests/Functional/Service/Signalement/PhotoHelperTest.php
new file mode 100644
index 000000000..9cbdcdf5a
--- /dev/null
+++ b/tests/Functional/Service/Signalement/PhotoHelperTest.php
@@ -0,0 +1,122 @@
+<?php
+
+namespace App\Tests\Functional\Service\Signalement;
+
+use App\Entity\Enum\DocumentType;
+use App\Factory\SignalementAffectationListViewFactory;
+use App\Factory\SignalementExportFactory;
+use App\Factory\SignalementFactory;
+use App\Manager\SignalementManager;
+use App\Manager\SuiviManager;
+use App\Repository\BailleurRepository;
+use App\Repository\DesordreCritereRepository;
+use App\Repository\DesordrePrecisionRepository;
+use App\Service\Signalement\CriticiteCalculator;
+use App\Service\Signalement\DesordreTraitement\DesordreCompositionLogementLoader;
+use App\Service\Signalement\PhotoHelper;
+use App\Service\Signalement\Qualification\QualificationStatusService;
+use App\Service\Signalement\Qualification\SignalementQualificationUpdater;
+use App\Specification\Signalement\SuroccupationSpecification;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\Persistence\ManagerRegistry;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Bundle\SecurityBundle\Security;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Security\Csrf\CsrfTokenManagerInterface;
+
+class PhotoHelperTest extends KernelTestCase
+{
+    private EntityManagerInterface $entityManager;
+    private Security $security;
+    private ManagerRegistry $managerRegistry;
+    private SignalementFactory $signalementFactory;
+    private EventDispatcherInterface $eventDispatcher;
+    private QualificationStatusService $qualificationStatusService;
+    private SignalementAffectationListViewFactory $signalementAffectationListViewFactory;
+    private SignalementExportFactory $signalementExportFactory;
+    private ParameterBagInterface $parameterBag;
+    private SignalementManager $signalementManager;
+    private CsrfTokenManagerInterface $csrfTokenManager;
+    private SuroccupationSpecification $suroccupationSpecification;
+    private CriticiteCalculator $criticiteCalculator;
+    private SignalementQualificationUpdater $signalementQualificationUpdater;
+    private DesordrePrecisionRepository $desordrePrecisionRepository;
+    private DesordreCritereRepository $desordreCritereRepository;
+    private DesordreCompositionLogementLoader $desordreCompositionLogementLoader;
+    private SuiviManager $suiviManager;
+    private BailleurRepository $bailleurRepository;
+
+    protected function setUp(): void
+    {
+        $this->entityManager = static::getContainer()->get('doctrine')->getManager();
+        $this->managerRegistry = static::getContainer()->get(ManagerRegistry::class);
+        $this->security = static::getContainer()->get('security.helper');
+        $this->signalementFactory = static::getContainer()->get(SignalementFactory::class);
+        $this->eventDispatcher = static::getContainer()->get(EventDispatcherInterface::class);
+        /* @var QualificationStatusService $qualificationStatusService */
+        $this->qualificationStatusService = static::getContainer()->get(QualificationStatusService::class);
+        $this->signalementAffectationListViewFactory = static::getContainer()->get(
+            SignalementAffectationListViewFactory::class
+        );
+        $this->signalementExportFactory = static::getContainer()->get(SignalementExportFactory::class);
+        $this->parameterBag = static::getContainer()->get(ParameterBagInterface::class);
+        $this->csrfTokenManager = static::getContainer()->get(CsrfTokenManagerInterface::class);
+        $this->suroccupationSpecification = static::getContainer()->get(SuroccupationSpecification::class);
+        $this->criticiteCalculator = static::getContainer()->get(CriticiteCalculator::class);
+        $this->signalementQualificationUpdater = static::getContainer()->get(SignalementQualificationUpdater::class);
+        $this->desordrePrecisionRepository = static::getContainer()->get(DesordrePrecisionRepository::class);
+        $this->desordreCritereRepository = static::getContainer()->get(DesordreCritereRepository::class);
+        $this->desordreCompositionLogementLoader = static::getContainer()->get(DesordreCompositionLogementLoader::class);
+        $this->suiviManager = static::getContainer()->get(SuiviManager::class);
+        $this->bailleurRepository = static::getContainer()->get(BailleurRepository::class);
+
+        $this->signalementManager = new SignalementManager(
+            $this->managerRegistry,
+            $this->security,
+            $this->signalementFactory,
+            $this->eventDispatcher,
+            $this->qualificationStatusService,
+            $this->signalementAffectationListViewFactory,
+            $this->signalementExportFactory,
+            $this->parameterBag,
+            $this->csrfTokenManager,
+            $this->suroccupationSpecification,
+            $this->criticiteCalculator,
+            $this->signalementQualificationUpdater,
+            $this->desordrePrecisionRepository,
+            $this->desordreCritereRepository,
+            $this->desordreCompositionLogementLoader,
+            $this->suiviManager,
+            $this->bailleurRepository,
+        );
+    }
+
+    public function testGetPhotosBySlug(): void
+    {
+        $signalement = $this->signalementManager->findOneBy(['reference' => '2023-27']);
+
+        $desordrePrecisionSlug = 'desordres_batiment_proprete_interieur';
+        $photos = PhotoHelper::getPhotosBySlug($signalement, $desordrePrecisionSlug);
+        $this->assertCount(1, $photos);
+        $firstKey = array_keys($photos)[0];
+        $this->assertEquals(DocumentType::PHOTO_SITUATION, $photos[$firstKey]->getDocumentType());
+        $this->assertEquals('Capture-d-ecran-du-2023-06-13-12-58-43-648b2a6b9730f.png', $photos[$firstKey]->getTitle());
+
+        $desordrePrecisionSlug = 'desordres_batiment_isolation_murs';
+        $photos = PhotoHelper::getPhotosBySlug($signalement, $desordrePrecisionSlug);
+        $this->assertCount(0, $photos);
+    }
+
+    public function testGetSortedPhotos(): void
+    {
+        $signalement = $this->signalementManager->findOneBy(['reference' => '2023-27']);
+
+        $photos = PhotoHelper::getSortedPhotos($signalement);
+        $this->assertCount(3, $photos);
+        $this->assertEquals(DocumentType::PHOTO_SITUATION, $photos[0]->getDocumentType());
+        $this->assertEquals('Capture-d-ecran-du-2023-06-13-12-58-43-648b2a6b9730f.png', $photos[0]->getTitle());
+        $this->assertEquals(DocumentType::PHOTO_SITUATION, $photos[1]->getDocumentType());
+        $this->assertEquals(DocumentType::AUTRE, $photos[2]->getDocumentType());
+    }
+}
diff --git a/tests/Unit/Factory/FileFactoryTest.php b/tests/Unit/Factory/FileFactoryTest.php
index af38edf24..12150cd9d 100644
--- a/tests/Unit/Factory/FileFactoryTest.php
+++ b/tests/Unit/Factory/FileFactoryTest.php
@@ -76,7 +76,7 @@ public function provideFileItem(): \Generator
                 'slug' => 'bail_dpe_dpe_upload',
             ],
             'dummy-filename-dpe.PNG',
-            File::FILE_TYPE_PHOTO,
+            File::FILE_TYPE_DOCUMENT,
             DocumentType::SITUATION_FOYER_DPE,
         ];
 
@@ -112,7 +112,7 @@ public function provideFileItem(): \Generator
                 'slug' => 'bail_dpe_bail_upload',
             ],
             'dummy-filename-bail.png',
-            File::FILE_TYPE_PHOTO,
+            File::FILE_TYPE_DOCUMENT,
             DocumentType::SITUATION_FOYER_BAIL,
         ];
 
@@ -139,5 +139,17 @@ public function provideFileItem(): \Generator
             File::FILE_TYPE_DOCUMENT,
             DocumentType::PHOTO_SITUATION,
         ];
+
+        yield 'Désordre photos ' => [
+            [
+                'key' => 'photos',
+                'file' => 'dummy-filename-desordre.png',
+                'titre' => 'dummy-filename-desordre-titre.png',
+                'slug' => 'desordres_batiment_isolation_photos_upload',
+            ],
+            'dummy-filename-desordre.png',
+            File::FILE_TYPE_PHOTO,
+            DocumentType::PHOTO_SITUATION,
+        ];
     }
 }