diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig
index 2e0dbdd77..33d59f404 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/create.html.twig
@@ -1,5 +1,7 @@
 {% extends "@ChillMain/layout.html.twig"  %}
 
+{% block title 'notification.Notify'|trans %}
+
 {% block js %}
     {{ parent() }}
     {{ encore_entry_script_tags('mod_pickentity_type') }}
@@ -11,23 +13,33 @@
 {% endblock %}
 
 {% block content %}
-<div class="col-10">
-    {% include handler.template(notification) with handler.templateData(notification) %}
+<div class="col-8 notification notification-new">
+    <h1 class="mb-3">{{ block('title') }}</h1>
 
     {{ form_start(form, { 'attr': { 'id': 'notification' }}) }}
 
-    {{ form_row(form.title) }}
-    {{ form_row(form.addressees) }}
-    {{ form_row(form.message) }}
+    {{ form_row(form.title, { 'label': 'notification.subject'|trans }) }}
+    {{ form_row(form.addressees, { 'label': 'notification.sent_to'|trans }) }}
+
+    {% include handler.template(notification) with handler.templateData(notification) %}
+
+    <div class="mb-3 row">
+        <label class="col-form-label col-sm-4" for="notification_message">{{ form_label(form.message) }}</label>
+        <div class="col-12">
+            {{ form_widget(form.message) }}
+        </div>
+    </div>
 
     {{ form_end(form) }}
-    
+
     <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
             <a href="{{ chill_return_path_or('chill_main_homepage') }}" class="btn btn-cancel">{{ 'Cancel'|trans|chill_return_path_label }}</a>
         </li>
         <li>
-            <button type="submit" form="notification" class="btn btn-save">{{ 'Save'|trans }}</button>
+            <button type="submit" form="notification" class="btn btn-save change-icon">
+                <i class="fa fa-paper-plane fa-fw"></i> {{ 'notification.Send'|trans }}
+            </button>
         </li>
     </ul>
 </div>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/edit.html.twig
index b2aaa7842..9388d2656 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Notification/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/edit.html.twig
@@ -1,5 +1,7 @@
 {% extends "@ChillMain/layout.html.twig"  %}
 
+{% block title 'notification.Edit notification'|trans %}
+
 {% block js %}
     {{ parent() }}
     {{ encore_entry_script_tags('mod_pickentity_type') }}
@@ -11,14 +13,22 @@
 {% endblock %}
 
 {% block content %}
-<div class="col-10">
-    {% include handler.template(notification) with handler.templateData(notification) %}
+<div class="col-8 notification notification-edit">
+    <h1 class="mb-3">{{ block('title') }}</h1>
 
     {{ form_start(form, { 'attr': { 'id': 'notification' }}) }}
 
-    {{ form_row(form.title) }}
-    {{ form_row(form.addressees) }}
-    {{ form_row(form.message) }}
+    {{ form_row(form.title, { 'label': 'notification.subject'|trans }) }}
+    {{ form_row(form.addressees, { 'label': 'notification.sent_to'|trans }) }}
+
+    {% include handler.template(notification) with handler.templateData(notification) %}
+
+    <div class="mb-3 row">
+        <label class="col-form-label col-sm-4" for="notification_message">{{ form_label(form.message) }}</label>
+        <div class="col-12">
+            {{ form_widget(form.message) }}
+        </div>
+    </div>
 
     {{ form_end(form) }}
 
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 73bbb5014..547ea2bd5 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -356,6 +356,8 @@ notification:
     Notification: Notification
     My own notifications: Mes notifications
     Notify: Envoyer une notification
+    Send: Envoyer
+    Edit notification: Modifier une notification
     Notification created: Notification envoyée
     Any notification received: Aucune notification reçue
     Any notification sent: Aucune notification envoyée
@@ -375,4 +377,5 @@ notification:
     received_from: Expéditeur
     you were notified by %sender%:  Vous avez été notifié par %sender%
     you were notified by system: Vous avez été notifié automatiquement
+    subject: Objet