diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig
index 3e227262a..2e7dd6cdb 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig
@@ -52,7 +52,7 @@
     </table>
         
     <ul class="record_actions">
-        <li>
+        <li class="cancel">
             <a href="{{ path('chill_event__event_show', { 'event_id' : participations[0].event.id } ) }}" class="btn btn-cancel">
                 {{ 'Back to the event'|trans }}
             </a>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_buttons.scss b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_buttons.scss
index a34381e7a..10f6d231e 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_buttons.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/modules/bootstrap/custom/_buttons.scss
@@ -64,6 +64,11 @@
       font: normal normal normal 14px/1 ForkAwesome;
       margin-right: 0.5em;
    }
+   &[class*='btn-']:empty {
+      &::before {
+         margin-right: 0;         
+      }
+   }
 }
 
 .btn {
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/new.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/new.html.twig
index 8b3d25100..6c9d00717 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/new.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/new.html.twig
@@ -36,11 +36,11 @@
     {{ form_row(form.endDate) }}
     {{ form_row(form.warningInterval) }}
 
-    <div class="grid-12 centered sticky-form-buttons">
-        <!-- {{ form_row(form.submit, { 'label': 'Add a new task'|trans, 'attr': {'class': 'fa fa-save btn btn-chill-green margin-10'}  })  }} -->
-
-        <button class="btn btn-chill-green margin-10" type="submit"><i class="fa fa-save"></i> {{ 'Add a new task'|trans }}</button>
-    </div>
+    <ul class="record_actions sticky-form-buttons">
+        <li>
+            {{ form_row(form.submit, { 'label': 'Add a new task'|trans, 'attr': {'class': 'btn btn-save'}  })  }}
+        </li>
+    </ul>
 
     {{ form_end(form) }}