diff --git a/module/doc/view/view.html.php b/module/doc/view/view.html.php
index b74479f097..46f946886a 100644
--- a/module/doc/view/view.html.php
+++ b/module/doc/view/view.html.php
@@ -90,14 +90,22 @@
           }
           echo $content;
           ?>
+          <div class='list-group files-list'>
           <?php foreach($doc->files as $file):?>
           <?php if(in_array($file->extension, $config->file->imageExtensions)):?>
-          <a href="<?php echo $file->webPath?>" target="_blank">
-            <img onload="setImageSize(this,0)" src="<?php echo $file->webPath?>" alt="<?php echo $file->title?>" title="<?php echo $file->title?>">
-          </a>
+          <?php $uploadDate = $lang->file->uploadDate . substr($file->addedDate, 0, 10);?>
+          <li class='list-group-item' title='<?php echo $uploadDate?>' style='position:relative;'>
+            <a href="<?php echo $file->webPath?>" target="_blank">
+              <img onload="setImageSize(this,0)" src="<?php echo $file->webPath?>" alt="<?php echo $file->title?>">
+            </a>
+            <span class='right-icon' style='position:absolute;right:-18px;top:0px;'>
+              <?php if(common::hasPriv('file', 'delete')) echo html::a('###', "<i class='icon-remove'></i>", '', "class='btn-icon' onclick='deleteFile($file->id)' title='$lang->delete'");?>
+            </span>
+          </li>
           <?php unset($doc->files[$file->id]);?>
           <?php endif;?>
           <?php endforeach;?>
+          </div>
 
           <?php if($doc->files):?>
           <div class='file-content'><?php echo $this->fetch('file', 'printFiles', array('files' => $doc->files, 'fieldset' => 'false'));?></div>
diff --git a/module/file/view/printfiles.html.php b/module/file/view/printfiles.html.php
index caaad1fe11..5eed0cd0a8 100644
--- a/module/file/view/printfiles.html.php
+++ b/module/file/view/printfiles.html.php
@@ -53,12 +53,11 @@ function downloadFile(fileID, extension, imageWidth)
   {
       if(common::hasPriv('file', 'download'))
       {
-          $uploadDate = $lang->file->uploadDate . $file->addedDate;
-          $fileTitle  = "<li title={$uploadDate} class='list-group-item'><i class='icon-file-text text-muted icon'></i> &nbsp;" . $file->title .'.' . $file->extension;
+          $uploadDate = $lang->file->uploadDate . substr($file->addedDate, 0, 10);
+          $fileTitle  = "<li title='{$uploadDate}' class='list-group-item'><i class='icon-file-text text-muted icon'></i> &nbsp;" . $file->title .'.' . $file->extension;
           $imageWidth = 0;
           if(stripos('jpg|jpeg|gif|png|bmp', $file->extension) !== false)
           {
-              $file = $this->file->getById($file->id);
               $imageSize  = getimagesize($file->realPath);
               $imageWidth = $imageSize ? $imageSize[0] : 0;
           }