diff --git a/Controller/ActivityReasonController.php b/Controller/ActivityReasonController.php
index a76221704..6afeceac7 100644
--- a/Controller/ActivityReasonController.php
+++ b/Controller/ActivityReasonController.php
@@ -45,7 +45,7 @@ class ActivityReasonController extends AbstractController
             $em->persist($entity);
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_activity_activityreason_show', array('id' => $entity->getId())));
+            return $this->redirect($this->generateUrl('chill_activity_activityreason', array('id' => $entity->getId())));
         }
 
         return $this->render('ChillActivityBundle:ActivityReason:new.html.twig', array(
@@ -167,7 +167,7 @@ class ActivityReasonController extends AbstractController
         if ($editForm->isValid()) {
             $em->flush();
 
-            return $this->redirect($this->generateUrl('chill_activity_activityreason_edit', array('id' => $id)));
+            return $this->redirect($this->generateUrl('chill_activity_activityreason', array('id' => $id)));
         }
 
         return $this->render('ChillActivityBundle:ActivityReason:edit.html.twig', array(
diff --git a/Resources/views/ActivityReason/edit.html.twig b/Resources/views/ActivityReason/edit.html.twig
index 11d9ef074..e8baab4bd 100644
--- a/Resources/views/ActivityReason/edit.html.twig
+++ b/Resources/views/ActivityReason/edit.html.twig
@@ -23,14 +23,15 @@
     {{ form_row(edit_form.name) }}
     {{ form_row(edit_form.active) }}
     {{ form_row(edit_form.category) }}
-    {{ form_row(edit_form.submit, { 'attr': { 'class' : 'sc-button orange' } } ) }}
-    {{ form_end(edit_form) }}
 
-        <ul class="record_actions">
-    <li>
-        <a href="{{ path('chill_activity_activityreason') }}">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-</ul>
+    <ul class="record_actions">
+        <li class="cancel">
+            <a href="{{ path('chill_activity_activityreason') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+        </li>
+        <li>
+            {{ form_row(edit_form.submit, { 'attr': { 'class' : 'sc-button orange' } } ) }}
+        </li>
+    </ul>
+
+    {{ form_end(edit_form) }}
 {% endblock %}
diff --git a/Resources/views/ActivityReason/index.html.twig b/Resources/views/ActivityReason/index.html.twig
index 588c4b45b..99aa1bfa7 100644
--- a/Resources/views/ActivityReason/index.html.twig
+++ b/Resources/views/ActivityReason/index.html.twig
@@ -31,12 +31,12 @@
             <tr class="{% if entity.active %}active{% else %}inactive{% endif %}">
                 <td><a href="{{ path('chill_activity_activityreason_show', { 'id': entity.id }) }}">{{ entity.name|localize_translatable_string }}</a></td>
                 <td>
-                <ul>
+                <ul class="record_actions">
                     <li>
-                        <a href="{{ path('chill_activity_activityreason_show', { 'id': entity.id }) }}">{{ 'show'|trans }}</a>
+                        <a href="{{ path('chill_activity_activityreason_show', { 'id': entity.id }) }}" class="sc-button bt-show" title="{{ 'show'|trans }}"></a>
                     </li>
                     <li>
-                        <a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}">{{ 'edit'|trans }}</a>
+                        <a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
                     </li>
                 </ul>
                 </td>
@@ -45,9 +45,9 @@
         </tbody>
     </table>
 
-        <ul>
+    <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_activity_activityreason_new') }}">
+            <a href="{{ path('chill_activity_activityreason_new') }}" class="sc-button bt-new">
                 {{ 'Create a new activity reason'|trans }}
             </a>
         </li>
diff --git a/Resources/views/ActivityReason/new.html.twig b/Resources/views/ActivityReason/new.html.twig
index a9a3ea6ac..13b8b41e4 100644
--- a/Resources/views/ActivityReason/new.html.twig
+++ b/Resources/views/ActivityReason/new.html.twig
@@ -23,14 +23,15 @@
     {{ form_row(form.name) }}
     {{ form_row(form.active) }}
     {{ form_row(form.category) }}
-    {{ form_row(form.submit, { 'attr': { 'class' : 'sc-button green' } } ) }}
-    {{ form_end(form) }}
 
-        <ul class="record_actions">
-    <li>
-        <a href="{{ path('chill_activity_activityreason') }}">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-</ul>
+    <ul class="record_actions">
+        <li class="cancel">
+            <a href="{{ path('chill_activity_activityreason') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+        </li>
+        <li>
+            {{ form_row(form.submit, { 'attr': { 'class' : 'sc-button bt-new' } } ) }}
+        </li>
+    </ul>
+
+    {{ form_end(form) }}
 {% endblock %}
diff --git a/Resources/views/ActivityReason/show.html.twig b/Resources/views/ActivityReason/show.html.twig
index 5b58d7064..6ac8e2a24 100644
--- a/Resources/views/ActivityReason/show.html.twig
+++ b/Resources/views/ActivityReason/show.html.twig
@@ -38,16 +38,16 @@
         </tbody>
     </table>
 
-        <ul class="record_actions">
-    <li>
-        <a href="{{ path('chill_activity_activityreason') }}">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-    <li>
-        <a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}">
-            {{ 'Edit'|trans }}
-        </a>
-    </li>
-</ul>
+    <ul class="record_actions">
+        <li class="cancel">
+            <a href="{{ path('chill_activity_activityreason') }}" class="sc-button bt-cancel">
+                {{ 'Back to the list'|trans }}
+            </a>
+        </li>
+        <li>
+            <a href="{{ path('chill_activity_activityreason_edit', { 'id': entity.id }) }}" class="sc-button bt-edit">
+                {{ 'Edit'|trans }}
+            </a>
+        </li>
+    </ul>
 {% endblock %}
diff --git a/Resources/views/ActivityReasonCategory/edit.html.twig b/Resources/views/ActivityReasonCategory/edit.html.twig
index f829625f7..7a161dad9 100644
--- a/Resources/views/ActivityReasonCategory/edit.html.twig
+++ b/Resources/views/ActivityReasonCategory/edit.html.twig
@@ -22,14 +22,17 @@
     {{ form_start(edit_form) }}
     {{ form_row(edit_form.name) }}
     {{ form_row(edit_form.active) }}
-    {{ form_row(edit_form.submit, { 'attr': { 'class': 'sc-button orange' } } ) }}
-    {{ form_end(edit_form) }}
 
-        <ul class="record_actions">
-    <li>
-        <a href="{{ path('chill_activity_activityreasoncategory') }}">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-</ul>
+    <ul class="record_actions">
+        <li class="cancel">
+            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="sc-button bt-cancel">
+                {{ 'Back to the list'|trans }}
+            </a>
+        </li>
+        <li>
+            {{ form_row(edit_form.submit, { 'attr': { 'class': 'sc-button bt-edit' } } ) }}
+        </li>
+    </ul>
+
+    {{ form_end(edit_form) }}
 {% endblock %}
diff --git a/Resources/views/ActivityReasonCategory/index.html.twig b/Resources/views/ActivityReasonCategory/index.html.twig
index 20a65f391..db9c927c4 100644
--- a/Resources/views/ActivityReasonCategory/index.html.twig
+++ b/Resources/views/ActivityReasonCategory/index.html.twig
@@ -29,14 +29,15 @@
         <tbody>
         {% for entity in entities %}
             <tr>
-                <td><a href="{{ path('chill_activity_activityreasoncategory_show', { 'id': entity.id }) }}">{{ entity.name|localize_translatable_string }}</a></td>
                 <td>
-                <ul>
+                    <a href="{{ path('chill_activity_activityreasoncategory_show', { 'id': entity.id }) }}">{{ entity.name|localize_translatable_string }}</a></td>
+                <td>
+                    <ul class="record_actions">
                     <li>
-                        <a href="{{ path('chill_activity_activityreasoncategory_show', { 'id': entity.id }) }}">{{ 'show'|trans }}</a>
+                        <a href="{{ path('chill_activity_activityreasoncategory_show', { 'id': entity.id }) }}" class="sc-button bt-show" title="{{ 'show'|trans }}"></a>
                     </li>
                     <li>
-                        <a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}">{{ 'edit'|trans }}</a>
+                        <a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
                     </li>
                 </ul>
                 </td>
@@ -45,9 +46,9 @@
         </tbody>
     </table>
 
-    <ul>
+    <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_activity_activityreasoncategory_new') }}">
+            <a href="{{ path('chill_activity_activityreasoncategory_new') }}" class="sc-button bt-new">
                 {{ 'Create a new activity category reason'|trans }}
             </a>
         </li>
diff --git a/Resources/views/ActivityReasonCategory/new.html.twig b/Resources/views/ActivityReasonCategory/new.html.twig
index dba2c2fcd..3ac9e503f 100644
--- a/Resources/views/ActivityReasonCategory/new.html.twig
+++ b/Resources/views/ActivityReasonCategory/new.html.twig
@@ -22,14 +22,15 @@
     {{ form_start(form) }}
     {{ form_row(form.name) }}
     {{ form_row(form.active) }}
-    {{ form_widget(form.submit, { 'attr': { 'class' : 'sc-button blue' } } ) }}
-    <p>{{ form_end(form) }}</p>
 
-        <ul class="record_actions">
-    <li>
-        <a href="{{ path('chill_activity_activityreasoncategory') }}">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-</ul>
+    <ul class="record_actions">
+        <li class="cancel">
+            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="sc-button bt-cancel">{{ 'Back to the list'|trans }}</a>
+        </li>
+        <li>
+            {{ form_widget(form.submit, { 'attr': { 'class' : 'sc-button bt-new' } } ) }}
+        </li>
+    </ul>
+    {{ form_end(form) }}
+
 {% endblock %}
diff --git a/Resources/views/ActivityReasonCategory/show.html.twig b/Resources/views/ActivityReasonCategory/show.html.twig
index d85972068..d45a7f27c 100644
--- a/Resources/views/ActivityReasonCategory/show.html.twig
+++ b/Resources/views/ActivityReasonCategory/show.html.twig
@@ -37,17 +37,16 @@
             </tr>
         </tbody>
     </table>
-
-        <ul class="record_actions">
-    <li>
-        <a href="{{ path('chill_activity_activityreasoncategory') }}">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-    <li>
-        <a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}">
-            {{ 'Edit'|trans }}
-        </a>
-    </li>
-</ul>
+    <ul class="record_actions">
+        <li class="cancel">
+            <a href="{{ path('chill_activity_activityreasoncategory') }}" class="sc-button bt-cancel">
+                {{ 'Back to the list'|trans }}
+            </a>
+        </li>
+        <li>
+            <a href="{{ path('chill_activity_activityreasoncategory_edit', { 'id': entity.id }) }}" class="sc-button bt-edit">
+                {{ 'Edit'|trans }}
+            </a>
+        </li>
+    </ul>
 {% endblock %}
diff --git a/Resources/views/ActivityType/edit.html.twig b/Resources/views/ActivityType/edit.html.twig
index c3f2d9e69..99bc71057 100644
--- a/Resources/views/ActivityType/edit.html.twig
+++ b/Resources/views/ActivityType/edit.html.twig
@@ -26,8 +26,8 @@
     
 
     <ul class="record_actions">
-        <li>
-            <a href="{{ path('chill_activity_activitytype') }}">
+        <li class="cancel">
+            <a href="{{ path('chill_activity_activitytype') }}" class="sc-button bt-cancel">
                 {{ 'Back to the list'|trans }}
             </a>
         </li>
diff --git a/Resources/views/ActivityType/index.html.twig b/Resources/views/ActivityType/index.html.twig
index b27fb168c..d9f0cbca6 100644
--- a/Resources/views/ActivityType/index.html.twig
+++ b/Resources/views/ActivityType/index.html.twig
@@ -41,10 +41,10 @@
                 <td>
                 <ul class="record_actions">
                     <li>
-                        <a href="{{ path('chill_activity_activitytype_show', { 'id': entity.id }) }}" class="sc-button bt-reset">{{ 'show'|trans|capitalize }}</a>
+                        <a href="{{ path('chill_activity_activitytype_show', { 'id': entity.id }) }}" class="sc-button bt-show" title="{{ 'show'|trans }}"></a>
                     </li>
                     <li>
-                        <a href="{{ path('chill_activity_activitytype_edit', { 'id': entity.id }) }}" class="sc-button bt-edit">{{ 'edit'|trans|capitalize }}</a>
+                        <a href="{{ path('chill_activity_activitytype_edit', { 'id': entity.id }) }}" class="sc-button bt-edit" title="{{ 'edit'|trans }}"></a>
                     </li>
                 </ul>
                 </td>
diff --git a/Resources/views/ActivityType/new.html.twig b/Resources/views/ActivityType/new.html.twig
index efb329ca5..efc294efd 100644
--- a/Resources/views/ActivityType/new.html.twig
+++ b/Resources/views/ActivityType/new.html.twig
@@ -24,13 +24,13 @@
     {{ form_row(form.name) }}
     
     <ul class="record_actions">
-        <li>
-            <a href="{{ path('chill_activity_activitytype') }}">
+        <li class="cancel">
+            <a href="{{ path('chill_activity_activitytype') }}" class="sc-button bt-cancel">
                 {{ 'Back to the list'|trans }}
             </a>
         </li>
         <li>
-            {{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button blue' } } ) }}
+            {{ form_widget(form.submit, { 'attr' : { 'class' : 'sc-button bt-new' } } ) }}
         </li>
     </ul>
     {{ form_end(form) }}
diff --git a/Resources/views/ActivityType/show.html.twig b/Resources/views/ActivityType/show.html.twig
index cb7b4e3d3..bce0ed95b 100644
--- a/Resources/views/ActivityType/show.html.twig
+++ b/Resources/views/ActivityType/show.html.twig
@@ -27,17 +27,16 @@
             </tr>
         </tbody>
     </table>
-
-        <ul class="record_actions">
-    <li>
-        <a href="{{ path('chill_activity_activitytype') }}">
-            {{ 'Back to the list'|trans }}
-        </a>
-    </li>
-    <li>
-        <a href="{{ path('chill_activity_activitytype_edit', { 'id': entity.id }) }}">
-            {{ 'Edit'|trans }}
-        </a>
-    </li>
-</ul>
+    <ul class="record_actions">
+        <li class="cancel">
+            <a href="{{ path('chill_activity_activitytype') }}" class="sc-button bt-cancel">
+                {{ 'Back to the list'|trans }}
+            </a>
+        </li>
+        <li>
+            <a href="{{ path('chill_activity_activitytype_edit', { 'id': entity.id }) }}" class="sc-button bt-edit">
+                {{ 'Edit'|trans }}
+            </a>
+        </li>
+    </ul>
 {% endblock %}