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 97189c2ff..3e227262a 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/new-multiple.html.twig
@@ -54,7 +54,6 @@
     <ul class="record_actions">
         <li>
             <a href="{{ path('chill_event__event_show', { 'event_id' : participations[0].event.id } ) }}" class="btn btn-cancel">
-                <i class="fa fa-arrow-left"></i>
                 {{ 'Back to the event'|trans }}
             </a>
         </li>
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig
index 7fcd21c84..33f7bc213 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/new.html.twig
@@ -34,7 +34,6 @@
     <ul class="record_actions">
         <li class="cancel">
             <a href="{{ path('chill_event__event_show', { 'event_id' : participation.event.id } ) }}" class="btn btn-cancel">
-                <i class="fa fa-arrow-left"></i>
                 {{ 'Back to the event'|trans }}
             </a>
         </li>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
index 678890a07..1f30a99c2 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/OnTheFly.vue
@@ -91,11 +91,11 @@ export default {
       classAction() {
          switch (this.action) {
             case 'show':
-               return 'bt-show';
+               return 'btn-show';
             case 'edit':
-               return 'bt-update';
+               return 'btn-update';
             case 'create':
-               return 'bt-create';
+               return 'btn-create';
          }
       },
       titleAction() {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
index cacd71fd2..ce87a8274 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
@@ -60,7 +60,7 @@
 
             </template>
 
-            <button v-if="conc.allowRemove" @click="removeConcerned(conc)" class="btn bt-primary">
+            <button v-if="conc.allowRemove" @click="removeConcerned(conc)" class="btn btn-primary">
               {{ $t('household_members_editor.remove_concerned') }}
             </button>
           </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
index 0904a1065..0c8d54803 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
@@ -90,16 +90,14 @@
 
     {{ form_rest(form) }}
 
-    <ul class="col-12 list-inline sticky-form-buttons">
-        <li class="list-inline-item mr-auto">
-            <a href="{{ path('chill_person_view',  {'person_id' : person.id}) }}" class="btn btn-secondary">
-                <i class="fa fa-arrow-left"></i>
+    <ul class="col-12 record_actions sticky-form-buttons">
+        <li class="cancel">
+            <a href="{{ path('chill_person_view',  {'person_id' : person.id}) }}" class="btn btn-cancel">
                 {{ 'Return'|trans }}
             </a>
         </li>
-        <li class="list-inline-item">
-            <button class="btn btn-success" type="submit">
-                <i class="fa fa-fw fa-save"></i>
+        <li>
+            <button class="btn btn-save" type="submit">
                 {{ 'Save'|trans }}
             </button>
         </li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig
index 1ead756ff..2693a2bbc 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/confirm.html.twig
@@ -78,7 +78,6 @@
     <ul class="grid-12 record_actions">
         <li class="cancel">
             <a href="{{ app.request.headers.get('referer') }}" class="btn btn-chill-gray center margin-5">
-                <i class="fa fa-arrow-left"></i>
                 {{ 'Return'|trans }}
             </a>
         </li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig
index a4b32446f..f5136b6c6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/find_manually.html.twig
@@ -15,8 +15,7 @@
 
     <ul class="grid-12 record_actions ">
         <li class="cancel">
-            <a href="{{ path('chill_person_duplicate_view',  {'person_id' : person.id}) }}" class="btn">
-                <i class="fa fa-arrow-left"></i>
+            <a href="{{ path('chill_person_duplicate_view',  {'person_id' : person.id}) }}" class="btn btn-cancel">
                 {{ 'Return'|trans }}
             </a>
         </li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig
index b4dc54da7..84e75c20a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/view.html.twig
@@ -142,8 +142,7 @@
     
 <ul class="record_actions">
     <li class="cancel">
-        <a href="{{ path('chill_person_view', {person_id: person.id }) }}" class="btn">
-            <i class="fa fa-arrow-left"></i>
+        <a href="{{ path('chill_person_view', {person_id: person.id }) }}" class="btn btn-cancel">
             {{ 'Return'|trans }}</a>
     </li>
     <li>