diff --git a/Controller/UploadController.php b/Controller/UploadController.php
index f9ebe05fa38ff221bed16bf1751a56776e449e5a..6107062599733eea168d15dd669766a0982f2eba 100644
--- a/Controller/UploadController.php
+++ b/Controller/UploadController.php
@@ -153,9 +153,10 @@ class UploadController extends Controller
                 'files' => [
                     [
                         'id'          => $file->getId(),
-                        'name'        => $file->getOriginalFilename(),
+                        'name'        => $file->getDisplayName(),
                         'type'        => $file->getMimeType(),
                         'size'        => $file->getSize(),
+                        'icon'        => MimeTypeIcon::getMimeTypeIcon($file->getMimeType()),
                         'url'         => $this->router->generate('file_upload_get_content', $parameters),
                         'delete_type' => 'DELETE',
                         'delete_url'  => $this->router->generate('file_upload_delete', $parameters),
diff --git a/Entity/Repository/UploadedFileRepository.php b/Entity/Repository/UploadedFileRepository.php
index ebdce320550f977146b366995b5ccce57c85b78f..a4e8db8e3f9e69224d8728b8e9a109b976a20a3c 100644
--- a/Entity/Repository/UploadedFileRepository.php
+++ b/Entity/Repository/UploadedFileRepository.php
@@ -60,7 +60,7 @@ class UploadedFileRepository extends EntityRepository implements FileManagerInte
 
         $file
             ->setFilesystem($this->filesystem)
-            ->setOriginalFilename($filename)
+            ->setDisplayName($filename)
             ->setMetadata(
                 [
                     'original' => [
diff --git a/Entity/UploadedFile.php b/Entity/UploadedFile.php
index 8e774879d766cd7766abf32e9d4021170b22a49b..223c2b483161d34aea2f981adab34e6805194bf6 100644
--- a/Entity/UploadedFile.php
+++ b/Entity/UploadedFile.php
@@ -40,7 +40,7 @@ class UploadedFile
      * @ORM\Column(type="string", length=1024)
      * @var string
      */
-    private $originalFilename;
+    private $displayName;
 
     /**
      * @ORM\Column(type="string", length=1024)
@@ -113,12 +113,12 @@ class UploadedFile
     /**
      * Set originalFilename
      *
-     * @param string $originalFilename
+     * @param string $displayName
      * @return UploadedFile
      */
-    public function setOriginalFilename($originalFilename)
+    public function setDisplayName($displayName)
     {
-        $this->originalFilename = $originalFilename;
+        $this->displayName = $displayName;
 
         return $this;
     }
@@ -128,9 +128,9 @@ class UploadedFile
      *
      * @return string
      */
-    public function getOriginalFilename()
+    public function getDisplayName()
     {
-        return $this->originalFilename;
+        return $this->displayName;
     }
 
     /**