diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/index.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/index.html.twig
index 0d4a7d637..f341f2946 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/index.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/AccompanyingCourseDocument/index.html.twig
@@ -19,7 +19,7 @@
 {% endblock %}
 
 {% block content %}
-<div class="col-md-10 col-xxl">
+<div class="document-list">
 	<h1>{{ 'Documents' }}</h1>
 
 	{% if documents|length == 0 %}
@@ -27,7 +27,7 @@
     {% else %}
 		<div class="flex-table chill-task-list">
 			{% for document in documents %}
-				{% include 'ChillDocStoreBundle:List:list_item.html.twig' %}
+				{% include '@ChillDocStore/List/list_item.html.twig' %}
 			{% endfor %}
 		</div>
     {% endif %}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
index 358127bfb..59dabdc4a 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/List/list_item.html.twig
@@ -1,8 +1,10 @@
 {% import "@ChillDocStore/Macro/macro.html.twig" as m %}
 {% import "@ChillDocStore/Macro/macro_mimeicon.html.twig" as mm %}
+{% import '@ChillPerson/Macro/updatedBy.html.twig' as mmm %}
+
 <div class="item-bloc">
     <div class="item-row">
-        <div class="item-col">
+        <div class="item-col" style="width: unset">
             <div class="denomination h2">
                 {{ document.title }}
             </div>
@@ -30,54 +32,50 @@
         </div>
     </div>
     {% if document.description is not empty %}
-        <div class="item-row separator">
-            <blockquote class="chill-user-quote">
+        <div class="item-row">
+            <blockquote class="chill-user-quote col">
                 {{ document.description|chill_markdown_to_html }}
             </blockquote>
         </div>
     {% endif %}
     <div class="item-row separator">
         <div class="item-col item-meta">
-            <div class="updatedBy">
-                {{ 'Created by'|trans }}:
-                <span class="user">{{ document.createdBy|chill_entity_render_string }}</span>
-                <span class="date">le {{ document.createdAt|format_date('long') }}</span>
-            </div>
+            {{ mmm.createdBy(document) }}
+        </div>
+        <div class="item-col">
+            {% if document.course is defined %}
+                <ul class="record_actions">
+                    {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS', document) %}
+                        <li>
+                            {{ m.download_button(document.object, document.title) }}
+                        </li>
+                        <li>
+                            <a href="{{ chill_path_add_return_path('accompanying_course_document_show', {'course': accompanyingCourse.id, 'id': document.id}) }}" class="btn btn-show"></a>
+                        </li>
+                    {% endif %}
+                    {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
+                        <li>
+                            <a href="{{ path('accompanying_course_document_edit', {'course': accompanyingCourse.id, 'id': document.id }) }}" class="btn btn-update"></a>
+                        </li>
+                    {% endif %}
+                </ul>
+            {% else %}
+                <ul class="record_actions">
+                    {% if is_granted('CHILL_PERSON_DOCUMENT_SEE_DETAILS', document) %}
+                        <li>
+                            {{ m.download_button(document.object, document.title) }}
+                        </li>
+                        <li>
+                            <a href="{{ path('person_document_show', {'person': person.id, 'id': document.id}) }}" class="btn btn-show"></a>
+                        </li>
+                    {% endif %}
+                    {% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
+                        <li>
+                            <a href="{{ path('person_document_edit', {'person': person.id, 'id': document.id}) }}" class="btn btn-update"></a>
+                        </li>
+                    {% endif %}
+                </ul>
+            {% endif %}
         </div>
     </div>
-    <div>
-    {% if document.course is defined %}
-        <ul class="record_actions">
-            {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS', document) %}
-                <li>
-                    {{ m.download_button(document.object, document.title) }}
-                </li>
-                <li>
-                    <a href="{{ chill_path_add_return_path('accompanying_course_document_show', {'course': accompanyingCourse.id, 'id': document.id}) }}" class="btn btn-show"></a>
-                </li>
-            {% endif %}
-            {% if is_granted('CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE', document) %}
-                <li>
-                    <a href="{{ path('accompanying_course_document_edit', {'course': accompanyingCourse.id, 'id': document.id }) }}" class="btn btn-update"></a>
-                </li>
-            {% endif %}
-        </ul>
-    {% else %}
-        <ul class="record_actions">
-            {% if is_granted('CHILL_PERSON_DOCUMENT_SEE_DETAILS', document) %}
-                <li>
-                    {{ m.download_button(document.object, document.title) }}
-                </li>
-                <li>
-                    <a href="{{ path('person_document_show', {'person': person.id, 'id': document.id}) }}" class="btn btn-show"></a>
-                </li>
-            {% endif %}
-            {% if is_granted('CHILL_PERSON_DOCUMENT_UPDATE', document) %}
-                <li>
-                    <a href="{{ path('person_document_edit', {'person': person.id, 'id': document.id}) }}" class="btn btn-update"></a>
-                </li>
-            {% endif %}
-        </ul>
-    {% endif %}
-    </div>
 </div>
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index d3173bd7c..78659c819 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -356,6 +356,7 @@ By: Par
 For: Pour
 Created for: Créé pour
 Created by: Créé par
+Created on: Créé le
 
 
 # Workflows 💊
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Macro/updatedBy.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Macro/updatedBy.html.twig
index a0be22ffc..e40cbd3f7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Macro/updatedBy.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Macro/updatedBy.html.twig
@@ -3,10 +3,27 @@
         {{ 'Last updated on'|trans }}
         <span class="date">
             {{ entity.updatedAt|format_datetime('medium', 'short') }}
-        </span>,
-        {{ 'by_user'|trans }}
-        <span class="user">
-            {{ entity.updatedBy|chill_entity_render_box }}
         </span>
+        {% if entity.updatedBy %}
+            {{ ', ' ~ 'by_user'|trans }}
+            <span class="user">
+                {{ entity.updatedBy|chill_entity_render_box }}
+            </span>
+        {% endif %}
+    </div>
+{% endmacro %}
+
+{% macro createdBy(entity) %}
+    <div class="updatedBy">
+        {{ 'Created on'|trans }}
+        <span class="date">
+            {{ entity.createdAt|format_datetime('medium', 'short') }}
+        </span>
+        {% if entity.createdBy %}
+            {{ ', ' ~ 'by_user'|trans }}
+            <span class="user">
+                {{ entity.createdBy|chill_entity_render_string }}
+            </span>
+        {% endif %}
     </div>
 {% endmacro %}
\ No newline at end of file