diff --git a/Resources/views/Activity/edit.html.twig b/Resources/views/Activity/edit.html.twig
index c0e082920..0c52cadf4 100644
--- a/Resources/views/Activity/edit.html.twig
+++ b/Resources/views/Activity/edit.html.twig
@@ -38,10 +38,16 @@
     
 
     {{ form_widget(edit_form) }}
-        <div class="grid-12 centered sticky-form-buttons">
-            <button class="sc-button green margin-10" type="submit"><i class="fa fa-save"></i> {{ 'Save activity'|trans }}</button>
-            <button class="sc-button red margin-10" type="reset"><i class="fa fa-eraser"></i> {{ 'Reset form'|trans }}</button>
-        </div>
+        <ul class="record_actions sticky-form-buttons">
+            <li class="cancel">
+                <a href="{{ path('chill_activity_activity_show', { 'id': entity.id, 'person_id': entity.person.id } ) }}" class="sc-button bt-cancel">
+                    {{ 'Cancel'|trans }}
+                </a>
+            </li>
+            <li>
+                <button class="sc-button bt-update" type="submit">{{ 'Save activity'|trans }}</button>
+            </li>
+        </ul>
     {{ form_end(edit_form) }}
 
     {# {{ form(delete_form) }} #}
diff --git a/Resources/views/Activity/list.html.twig b/Resources/views/Activity/list.html.twig
index d2d53d64c..1379d3472 100644
--- a/Resources/views/Activity/list.html.twig
+++ b/Resources/views/Activity/list.html.twig
@@ -26,7 +26,10 @@
     <h2>{{ 'Activity list' |trans }}</h2>
     
     {% if activities|length == 0 %}
-        <p class="chill-no-data-statement">{{ "There isn't any activities."|trans }}</p>
+        <p class="chill-no-data-statement">
+            {{ "There isn't any activities."|trans }} 
+            <a href="{{ path('chill_activity_activity_new', {'person_id': person.id}) }}" class="sc-button bt-create button-small no-content"></a>
+        </p>
     {% else %}
     <table class="records_list">
         <thead>
@@ -54,17 +57,21 @@
                 <td>
                     <ul class="record_actions">
                         <li>
-                            <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person.id }) }}" class="sc-button">{{ 'show'|trans|capitalize }}</a>
+                            <a href="{{ path('chill_activity_activity_show', { 'id': activity.id, 'person_id': person.id }) }}" class="sc-button bt-show has-hidden">
+                                
+                            </a>
                         </li>
                         {% if is_granted('CHILL_ACTIVITY_UPDATE', activity) %}
                         <li>
-                            <a href="{{ path('chill_activity_activity_edit', { 'id': activity.id, 'person_id': person.id }) }}" class="sc-button bt-update">{{ 'Edit' | trans }}</a>
+                            <a href="{{ path('chill_activity_activity_edit', { 'id': activity.id, 'person_id': person.id }) }}" class="sc-button bt-update has-hidden">
+                                
+                            </a>
                         </li>
                         {% endif %}
                         {% if is_granted('CHILL_ACTIVITY_DELETE', activity) %}
                         <li>
-                            <a href="{{ path('chill_activity_activity_delete', { 'id': activity.id, 'person_id' : person.id } ) }}" class="sc-button bt-delete">
-                                {{ 'Delete'|trans }}
+                            <a href="{{ path('chill_activity_activity_delete', { 'id': activity.id, 'person_id' : person.id } ) }}" class="sc-button bt-delete has-hidden">
+                                
                             </a>
                         </li>
                         {% endif %}
@@ -75,9 +82,11 @@
     </table>
     {% endif %}
     
-    <p>
-        <a href="{{ path('chill_activity_activity_new', {'person_id': person.id}) }}" class="sc-button bt-create">
-            {{ 'Add a new activity' | trans }}
-        </a>
-    </p>
+    <ul class="record_actions">
+        <li>
+            <a href="{{ path('chill_activity_activity_new', {'person_id': person.id}) }}" class="sc-button bt-create">
+                {{ 'Add a new activity' | trans }}
+            </a>
+        </li>
+    </ul>
 {% endblock %}
diff --git a/Resources/views/Activity/show.html.twig b/Resources/views/Activity/show.html.twig
index db769ee18..5f3b00b9f 100644
--- a/Resources/views/Activity/show.html.twig
+++ b/Resources/views/Activity/show.html.twig
@@ -41,9 +41,14 @@
     </dl>
 
     <ul class="record_actions">
+        <li class="cancel">
+            <a class="sc-button bt-cancel" href="{{ path('chill_activity_activity_list', { 'person_id': person.id } ) }}">
+                {{ 'Back to the list'|trans }}
+            </a>
+        </li>
         <li>
         <a class="sc-button bt-update" href="{{ path('chill_activity_activity_edit', { 'id': entity.id, 'person_id': person.id }) }}">
-            <i class="fa fa-pencil"></i> {{ 'Edit the activity'|trans }}
+            {{ 'Edit the activity'|trans }}
         </a>
         </li>
         {% if is_granted('CHILL_ACTIVITY_DELETE', entity) %}
diff --git a/Test/Fixtures/App/.DS_Store b/Test/Fixtures/App/.DS_Store
deleted file mode 100644
index a00f962ab..000000000
Binary files a/Test/Fixtures/App/.DS_Store and /dev/null differ
diff --git a/Test/Fixtures/App/app/.DS_Store b/Test/Fixtures/App/app/.DS_Store
deleted file mode 100644
index 160f0c174..000000000
Binary files a/Test/Fixtures/App/app/.DS_Store and /dev/null differ