diff --git a/Form/EventType.php b/Form/EventType.php
index fe365fbe6..913acb08e 100644
--- a/Form/EventType.php
+++ b/Form/EventType.php
@@ -2,8 +2,8 @@
 
 namespace Chill\EventBundle\Form;
 
+use Chill\MainBundle\Form\Type\ChillDateTimeType;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\Extension\Core\Type\DateType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolverInterface;
 use Chill\EventBundle\Form\Type\PickEventType;
@@ -69,10 +69,8 @@ class EventType extends AbstractType
                 
         $builder
             ->add('name')
-            ->add('date', DateType::class, array(
-                    'required' => true,
-                    'widget' => 'single_text',
-                    'format' => 'dd-MM-yyyy'
+            ->add('date', ChillDateTimeType::class, array(
+                    'required' => true
                 )
             )
             ->add('center', EntityType::class, array(
diff --git a/Resources/views/Event/list.html.twig b/Resources/views/Event/list.html.twig
index 93eaf0312..b6c051a3d 100644
--- a/Resources/views/Event/list.html.twig
+++ b/Resources/views/Event/list.html.twig
@@ -19,7 +19,7 @@
             {% for event in events %}
                 <tr>
                     <td>{{ event.name }}</td>
-                    <td>{{ event.date|localizeddate('long', 'none') }}</td>
+                    <td>{{ event.date|localizeddate('long', 'short') }}</td>
                     <td>{{ event.type.name|localize_translatable_string }}</td>
                     <td>
                         <ul class="record_actions">
diff --git a/Resources/views/Event/show.html.twig b/Resources/views/Event/show.html.twig
index e2aa9caf3..3d878295c 100644
--- a/Resources/views/Event/show.html.twig
+++ b/Resources/views/Event/show.html.twig
@@ -15,7 +15,7 @@
             </tr>
             <tr>
                 <th>{{ 'Date'|trans }}</th>
-                <td>{{ event.date|localizeddate('long', 'none') }}</td>
+                <td>{{ event.date|localizeddate('long', 'short') }}</td>
             </tr>
             <tr>
                 <th>{{ 'Event type'|trans }}</th>
diff --git a/Resources/views/Participation/edit-multiple.html.twig b/Resources/views/Participation/edit-multiple.html.twig
index 747b53260..1d6a8c5c7 100644
--- a/Resources/views/Participation/edit-multiple.html.twig
+++ b/Resources/views/Participation/edit-multiple.html.twig
@@ -13,7 +13,7 @@
             </tr>
             <tr>
                 <th>{{ 'Date'|trans }} </th>
-                <td>{{ event.date|localizeddate('long', 'none') }}</td>
+                <td>{{ event.date|localizeddate('long', 'short') }}</td>
             </tr>
         </tbody>
     </table>
@@ -47,7 +47,6 @@
     <ul class="record_actions">
         <li>
             <a href="{{ path('chill_event__event_show', { 'event_id' : event.id } ) }}" class="sc-button bt-cancel">
-                <i class="fa fa-arrow-left"></i>
                 {{ 'Back to the event'|trans }}
             </a>
         </li>
diff --git a/Resources/views/Participation/edit.html.twig b/Resources/views/Participation/edit.html.twig
index a778eeef7..dd6df62ef 100644
--- a/Resources/views/Participation/edit.html.twig
+++ b/Resources/views/Participation/edit.html.twig
@@ -17,7 +17,7 @@
             </tr>
             <tr>
                 <th>{{ 'Date'|trans }} </th>
-                <td>{{ participation.event.date|localizeddate('long', 'none') }}</td>
+                <td>{{ participation.event.date|localizeddate('long', 'short') }}</td>
             </tr>
         </tbody>
     </table>
@@ -29,7 +29,6 @@
     <ul class="record_actions">
         <li>
             <a href="{{ path('chill_event__event_show', { 'event_id' : participation.event.id } ) }}" class="sc-button bt-cancel">
-                <i class="fa fa-arrow-left"></i>
                 {{ 'Back to the event'|trans }}
             </a>
         </li>