diff --git a/module/doc/css/view.css b/module/doc/css/view.css
index 132a04d412..d0d7626150 100644
--- a/module/doc/css/view.css
+++ b/module/doc/css/view.css
@@ -1,2 +1,4 @@
 .versions .dropdown-menu{max-height:260px; overflow-y:auto;}
 .table-data > tbody > tr > th.w-80px {width:80px;}
+.detail-content .file-image{position: relative; padding: 0 10px;}
+.detail-content .file-image > span.right-icon{position: absolute; right: -10px; top: 0;}
diff --git a/module/doc/view/browse.html.php b/module/doc/view/browse.html.php
index e76f0a5a96..ab485fb744 100644
--- a/module/doc/view/browse.html.php
+++ b/module/doc/view/browse.html.php
@@ -79,7 +79,7 @@ var browseType = '<?php echo $browseType;?>';
               <td class="c-name"><?php echo html::a(inlink('view', "docID=$doc->id"), "<i class='icon icon-file-text text-muted'></i> &nbsp;" . $doc->title);?></td>
               <td class="c-actions">
                 <?php common::printLink('doc', 'collect', "objectID=$doc->id&objectType=doc", "<i class='icon {$star}'></i>", 'hiddenwin', "title='{$lang->doc->collect}' class='btn btn-link'")?>
-                <?php common::printLink('doc', 'edit', "docID=$doc->id", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link iframe'")?>
+                <?php common::printLink('doc', 'edit', "docID=$doc->id", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link'")?>
                 <?php common::printLink('doc', 'delete', "docID=$doc->id", "<i class='icon icon-trash'></i>", 'hiddenwin', "title='{$lang->delete}' class='btn btn-link'")?>
               </td>
               <td class="c-num"></td>
diff --git a/module/doc/view/browsebygrid.html.php b/module/doc/view/browsebygrid.html.php
index 0f31b542a3..379596f9a2 100644
--- a/module/doc/view/browsebygrid.html.php
+++ b/module/doc/view/browsebygrid.html.php
@@ -34,7 +34,7 @@
           </a>
           <div class="actions">
             <?php common::printLink('doc', 'collect', "objectID={$doc->id}&objectType=doc", "<i class='icon {$star}'></i>", 'hiddenwin', "title='{$lang->doc->collect}' class='btn btn-link'")?>
-            <?php common::printLink('doc', 'edit', "docID={$doc->id}", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link' data-toggle='modal'")?>
+            <?php common::printLink('doc', 'edit', "docID={$doc->id}", "<i class='icon icon-edit'></i>", '', "title='{$lang->edit}' class='btn btn-link'")?>
             <?php common::printLink('doc', 'delete', "docID={$doc->id}", "<i class='icon icon-trash'></i>", '', "title='{$lang->delete}' class='btn btn-link'")?>
           </div>
         </div>
diff --git a/module/doc/view/view.html.php b/module/doc/view/view.html.php
index 803dec1b3c..08a6e98567 100644
--- a/module/doc/view/view.html.php
+++ b/module/doc/view/view.html.php
@@ -83,12 +83,14 @@
 
           <?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 $this->createLink('file', 'read', "fileID={$file->id}");?>" 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>
+          <div class='file-image'>
+            <a href="<?php echo $file->webPath?>" target="_blank">
+              <img onload="setImageSize(this,0)" src="<?php echo $this->createLink('file', 'read', "fileID={$file->id}");?>" alt="<?php echo $file->title?>">
+            </a>
+            <span class='right-icon'>
+              <?php if(common::hasPriv('file', 'delete')) echo html::a('###', "<i class='icon icon-trash'></i>", '', "class='btn-icon' onclick='deleteFile($file->id)' title='$lang->delete'");?>
+            </span>
+          </div>
           <?php unset($doc->files[$file->id]);?>
           <?php endif;?>
           <?php endforeach;?>