diff --git a/Resources/public/sass/_task.scss b/Resources/public/sass/_task.scss
index bdd71e2a1..b5973c012 100644
--- a/Resources/public/sass/_task.scss
+++ b/Resources/public/sass/_task.scss
@@ -1,4 +1,4 @@
-
+@import '../../../../main/Resources/public/sass/custom/config/colors';
 
 div#single_task_warningInterval {
     display: flex;
@@ -21,30 +21,41 @@ div#single_task_warningInterval {
     }
 }
 
+.bt-task-label {
+    display: inline-flex;
+    margin-bottom: 0.2em;
+    font-size: 0.8em;
+    text-transform: capitalize;
+}
+
 .bt-task {
     display: block;
-    height: 12px;
-    width: 12px;
-    font-size: 0.8em;
+    height: 0;
+    width: 8px;
+    padding-right: 3px;;
 }
 
 .bt-task-exchange {
-    @extend .bt-task;
-    &::before {
-        content: url(../svg/exchange-alt.svg);
-    }
+    background: $chill-green;
+}
+.bt-task-exchange:hover {
+    background: $chill-green-dark;
 }
 
-.bt-task-start {
+.bt-task-exchange::before {
     @extend .bt-task;
-    &::before {
-        content: url(../svg/play.svg);
-    }
+    width: 10px;
+    content: url(../svg/exchange-alt.svg);
+}
+
+.bt-task-start::before {
+    @extend .bt-task;
+    content: url(../svg/play.svg);
 }
 
 .bt-task-cancel::before {
     @extend .bt-task;
-    content: url(../svg/times.svg);
+    content: url(../svg/archive.svg);
 }
 
 .bt-task-close::before {
@@ -61,9 +72,8 @@ div#single_task_warningInterval {
     display: none;
     position: absolute;
     background-color: #f9f9f9;
-    min-width: 160px;
     box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2);
-    padding: 12px 16px;
+    padding: 0.4em 0.7em;
     z-index: 1;
 }
 
diff --git a/Resources/public/svg/archive.svg b/Resources/public/svg/archive.svg
new file mode 100644
index 000000000..394dad2db
--- /dev/null
+++ b/Resources/public/svg/archive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M32 448c0 17.7 14.3 32 32 32h384c17.7 0 32-14.3 32-32V160H32v288zm160-212c0-6.6 5.4-12 12-12h104c6.6 0 12 5.4 12 12v8c0 6.6-5.4 12-12 12H204c-6.6 0-12-5.4-12-12v-8zM480 32H32C14.3 32 0 46.3 0 64v48c0 8.8 7.2 16 16 16h480c8.8 0 16-7.2 16-16V64c0-17.7-14.3-32-32-32z"/></svg>
\ No newline at end of file
diff --git a/Resources/public/svg/check.svg b/Resources/public/svg/check.svg
new file mode 100644
index 000000000..2ec27cf84
--- /dev/null
+++ b/Resources/public/svg/check.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path d="M173.898 439.404l-166.4-166.4c-9.997-9.997-9.997-26.206 0-36.204l36.203-36.204c9.997-9.998 26.207-9.998 36.204 0L192 312.69 432.095 72.596c9.997-9.997 26.207-9.997 36.204 0l36.203 36.204c9.997 9.997 9.997 26.206 0 36.204l-294.4 294.401c-9.998 9.997-26.207 9.997-36.204-.001z"/></svg>
\ No newline at end of file
diff --git a/Resources/public/svg/exchange-alt.svg b/Resources/public/svg/exchange-alt.svg
new file mode 100644
index 000000000..82ef60e98
--- /dev/null
+++ b/Resources/public/svg/exchange-alt.svg
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 512 512"
+   id="svg2"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="exchange-alt.svg">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1313"
+     inkscape:window-height="744"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="0.4609375"
+     inkscape:cx="256"
+     inkscape:cy="256"
+     inkscape:window-x="53"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     d="M0 168v-16c0-13.255 10.745-24 24-24h360V80c0-21.367 25.899-32.042 40.971-16.971l80 80c9.372 9.373 9.372 24.569 0 33.941l-80 80C409.956 271.982 384 261.456 384 240v-48H24c-13.255 0-24-10.745-24-24zm488 152H128v-48c0-21.314-25.862-32.08-40.971-16.971l-80 80c-9.372 9.373-9.372 24.569 0 33.941l80 80C102.057 463.997 128 453.437 128 432v-48h360c13.255 0 24-10.745 24-24v-16c0-13.255-10.745-24-24-24z"
+     id="path4"
+     style="fill:#ffffff;fill-opacity:1" />
+</svg>
diff --git a/Resources/public/svg/stop.svg b/Resources/public/svg/stop.svg
deleted file mode 100644
index 40338d449..000000000
--- a/Resources/public/svg/stop.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path d="M400 32H48C21.5 32 0 53.5 0 80v352c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48V80c0-26.5-21.5-48-48-48z"/></svg>
\ No newline at end of file
diff --git a/Resources/public/svg/times.svg b/Resources/public/svg/times.svg
deleted file mode 100644
index 02eef1b8f..000000000
--- a/Resources/public/svg/times.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path d="M323.1 441l53.9-53.9c9.4-9.4 9.4-24.5 0-33.9L279.8 256l97.2-97.2c9.4-9.4 9.4-24.5 0-33.9L323.1 71c-9.4-9.4-24.5-9.4-33.9 0L192 168.2 94.8 71c-9.4-9.4-24.5-9.4-33.9 0L7 124.9c-9.4 9.4-9.4 24.5 0 33.9l97.2 97.2L7 353.2c-9.4 9.4-9.4 24.5 0 33.9L60.9 441c9.4 9.4 24.5 9.4 33.9 0l97.2-97.2 97.2 97.2c9.3 9.3 24.5 9.3 33.9 0z"/></svg>
\ No newline at end of file
diff --git a/Resources/translations/messages.fr.yml b/Resources/translations/messages.fr.yml
index bad2028fb..f9d54eb57 100644
--- a/Resources/translations/messages.fr.yml
+++ b/Resources/translations/messages.fr.yml
@@ -56,6 +56,9 @@ Year: Année(s)
 'in_progress': 'en cours'
 'closed': 'fermée'
 'canceled': 'supprimée'
+start: démarrer
+close: clotûrer
+cancel: annuler
 
 #Flash messages
 'The task is created': 'La tâche a été créée'
diff --git a/Resources/views/SingleTask/_list.html.twig b/Resources/views/SingleTask/_list.html.twig
index fbb2052e5..f3f5dfb3f 100644
--- a/Resources/views/SingleTask/_list.html.twig
+++ b/Resources/views/SingleTask/_list.html.twig
@@ -26,10 +26,6 @@
                                 {% for place in workflow_marked_places(task) %}
                                     <span class="">{{ place|trans }}</span>
                                 {% endfor %}
-
-                                {% for transition in workflow_transitions(task) %}
-                                    <a href="{{ path('chill_task_task_transition', { 'taskId': task.id, 'transition': transition.name|trans, 'kind': 'single-task', 'return_path':  app.request.uri }) }}" class="{{ task_workflow_metadata(task, 'transition.class', transition)|e('html_attr') }}">{{ task_workflow_metadata(task, 'transition.verb', transition) }}</a>
-                                {% endfor %}
                             </td>
                             <td>
                                 {% if task.startDate is null and task.warningDate is null and task.endDate is null %}
@@ -61,7 +57,7 @@
                                             <a href="" class="sc-button bt-task-exchange">&nbsp;</a>
                                             <div class="bt-dropdown-content">
                                                 {% for transition in workflow_transitions(task) %}
-                                                    <a href="{{ path('chill_task_task_transition', { 'taskId': task.id, 'transition': transition.name|trans, 'kind': 'single-task', 'return_path':  app.request.uri }) }}" class="{{ task_workflow_metadata(task, 'transition.class', transition)|e('html_attr') }}">{{ task_workflow_metadata(task, 'transition.verb', transition) }}</a>
+                                                    <a href="{{ path('chill_task_task_transition', { 'taskId': task.id, 'transition': transition.name|trans, 'kind': 'single-task', 'return_path':  app.request.uri }) }}" class="{{ task_workflow_metadata(task, 'transition.class', transition)|e('html_attr') }}">{{ task_workflow_metadata(task, 'transition.verb', transition)|trans }}</a>
                                                 {% endfor %}
                                             </div>
                                         </div>
diff --git a/Workflow/Definition/DefaultTaskDefinition.php b/Workflow/Definition/DefaultTaskDefinition.php
index 271211ff0..cbe9d8350 100644
--- a/Workflow/Definition/DefaultTaskDefinition.php
+++ b/Workflow/Definition/DefaultTaskDefinition.php
@@ -31,15 +31,15 @@ class DefaultTaskDefinition implements \Chill\TaskBundle\Workflow\TaskWorkflowDe
     const TRANSITION_METADATA = [
         'close' => [
             'verb' => 'close',
-            'class' => 'sc-button bt-task-close'
+            'class' => 'sc-button bt-task-label bt-task-close'
         ],
         'cancel' => [
             'verb' => 'cancel',
-            'class' => 'sc-button bt-task-cancel'
+            'class' => 'sc-button bt-task-label bt-task-cancel'
         ],
         'start' => [
             'verb' => 'start',
-            'class' => 'sc-button bt-task-start'
+            'class' => 'sc-button bt-task-label bt-task-start'
         ]
     ];