diff --git a/templates/admin/default/assets/js/document-upload.js b/templates/admin/default/assets/js/document-upload.js
index dc35ea943..7843f5b44 100644
--- a/templates/admin/default/assets/js/document-upload.js
+++ b/templates/admin/default/assets/js/document-upload.js
@@ -4,7 +4,7 @@ $(function($){
 
     Dropzone.autoDiscover = false;
 
-    
+
 
     // Remove image on click
     $.documentUploadManager.initDocumentDropZone = function() {
@@ -14,7 +14,7 @@ $(function($){
             dictDefaultMessage : $('.btn-browse').html(),
             uploadMultiple: false,
             maxFilesize: 8
-        });    
+        });
 
         var totalFiles      = 0,
             completedFiles  = 0;
@@ -40,8 +40,8 @@ $(function($){
             $.documentUploadManager.updateDocumentListAjax();
             $.documentUploadManager.onClickDeleteDocument();
         });
-        
-              
+
+
 
     };
 
diff --git a/templates/admin/default/assets/less/thelia/thelia.less b/templates/admin/default/assets/less/thelia/thelia.less
index 00ab43a74..2189b9307 100644
--- a/templates/admin/default/assets/less/thelia/thelia.less
+++ b/templates/admin/default/assets/less/thelia/thelia.less
@@ -336,6 +336,13 @@
     }
 }
 
+.existing-document {
+
+    .loading{
+        margin: 0;
+    }
+}
+
 // -- Drag & drop --
 .take{
 
diff --git a/templates/admin/default/content-edit.html b/templates/admin/default/content-edit.html
index c0d010287..bd816e438 100644
--- a/templates/admin/default/content-edit.html
+++ b/templates/admin/default/content-edit.html
@@ -9,7 +9,7 @@
     <div class="folder edit-folder">
     <div id="wrapper" class="container">
 
-    {include file="includes/folder-breadcrumb.html" editing_category="false" editing_content="true"}
+    {include file="includes/folder-breadcrumb.html" editing_content="true"}
 
     <div class="row">
     {loop name="content_edit" type="content" visible="*" id="{$content_id}" backend_context="1" lang="$edit_language_id"}
@@ -131,7 +131,7 @@
                                 <div class="control-group">
                                     <lablel>&nbsp;</lablel>
                                     <div class="controls">
-                                        <p>{intl l='Colder created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}</p>
+                                        <p>{intl l='Folder created on %date_create. Last modification: %date_change' date_create="{format_date date=$CREATE_DATE}" date_change="{format_date date=$UPDATE_DATE}"}</p>
                                     </div>
                                 </div>
                             </div>
diff --git a/templates/admin/default/folder-edit.html b/templates/admin/default/folder-edit.html
index 7971a372f..bbf6a4b0a 100644
--- a/templates/admin/default/folder-edit.html
+++ b/templates/admin/default/folder-edit.html
@@ -9,7 +9,7 @@
 <div class="folder edit-folder">
 	<div id="wrapper" class="container">
 
-        {include file="includes/folder-breadcrumb.html" editing_category="true" }
+        {include file="includes/folder-breadcrumb.html" }
 
         <div class="row">
             {loop name="folder_edit" type="folder" visible="*" id="{$folder_id}" backend_context="1" lang="$edit_language_id"}
@@ -182,7 +182,7 @@
 									                        </span>
 									                    </div>
 
-									                    <span class="help-block">{intl l='Select a content and click (+) to add it to this category'}</span>
+									                    <span class="help-block">{intl l='Select a content and click (+) to add it to this folder'}</span>
 									                </div>
 									            </div>
 
diff --git a/templates/admin/default/folders.html b/templates/admin/default/folders.html
index 5a7d9a175..d1689608b 100644
--- a/templates/admin/default/folders.html
+++ b/templates/admin/default/folders.html
@@ -28,12 +28,7 @@
                             {elseloop rel="folder_title"}
                                 {intl l="Top level folders"}
                             {/elseloop}
-{*
-                            <td class="object-title">
-                                <a href="{url path='admin/folders' parent=$ID}" title="{intl l='Browse this folder'}">
-                                    {$TITLE}
-                                </a>
-                            </td>*}
+
                             {module_include location='folder_list_caption'}
 
                             {loop type="auth" name="can_create" role="ADMIN" resource="admin.folder" access="CREATE"}
diff --git a/templates/admin/default/includes/content-folder-management.html b/templates/admin/default/includes/content-folder-management.html
index 31f86e058..cbace2455 100644
--- a/templates/admin/default/includes/content-folder-management.html
+++ b/templates/admin/default/includes/content-folder-management.html
@@ -6,7 +6,7 @@
                 <div class="form-group">
                     <form method="POST" action="{url path='/admin/content/folder/add'}" id="related_content_form">
 
-                        <p class="title title-without-tabs">{intl l='Additional categories'}</p>
+                        <p class="title title-without-tabs">{intl l='Additional Folders'}</p>
                         <p>{intl l='A content could be attached to more than one folder. Select here the additional fodlers for this content.'}
                             {loop name="default_folder" type="folder" id=$DEFAULT_FOLDER}
                             {intl l='You can change the default folder (%title) in the "General" tab.' title=$TITLE}
diff --git a/templates/admin/default/includes/document-upload-list-ajax.html b/templates/admin/default/includes/document-upload-list-ajax.html
index 1233e06a8..5c271e769 100644
--- a/templates/admin/default/includes/document-upload-list-ajax.html
+++ b/templates/admin/default/includes/document-upload-list-ajax.html
@@ -29,3 +29,6 @@ Parameters:
         {/loop}
     </table>
 {/ifloop}
+{elseloop rel="document"}
+<div class="alert alert-info">{intl l='There is no documents attached to this %type.' type=$documentType}</div>
+{/elseloop}
diff --git a/templates/admin/default/includes/image-upload-list-ajax.html b/templates/admin/default/includes/image-upload-list-ajax.html
index e2c19932b..8acb5c7ef 100644
--- a/templates/admin/default/includes/image-upload-list-ajax.html
+++ b/templates/admin/default/includes/image-upload-list-ajax.html
@@ -27,4 +27,7 @@ Parameters:
             </div>
         {/loop}
     </div>
-{/ifloop}
\ No newline at end of file
+{/ifloop}
+{elseloop rel="image"}
+<div class="alert alert-info">{intl l='There is no images attached to this %type.' type=$imageType}</div>
+{/elseloop}
\ No newline at end of file