diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig b/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig
index 73527edb3..1adb6872b 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig
@@ -27,9 +27,7 @@
                         </form>
                     </td>
                     <td>
-                        <a href="{{ chill_path_add_return_path('chill_crud_docgen_template_edit', { 'id': entity.id }) }}" class="btn btn-edit">
-                            {{ 'Edit'|trans }}
-                        </a>
+                        <a href="{{ chill_path_add_return_path('chill_crud_docgen_template_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'Edit'|trans }}"></a>
                     </td>
                 </tr>
             {% endfor %}
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/index.html.twig b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/index.html.twig
index 5731f57f5..ff20257a5 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/index.html.twig
+++ b/src/Bundle/ChillDocStoreBundle/Resources/views/DocumentCategory/index.html.twig
@@ -5,14 +5,14 @@
 {% block admin_content %}
     <h1>{{ 'Document category list' | trans }}</h1>
 
-    <table class="table">
+    <table class="table table-bordered border-dark align-middle">
         <thead>
             <tr>
                 <th>{{ 'Creator bundle id' | trans }}</th>
                 <th>{{ 'Internal id inside creator bundle' | trans }}</th>
                 <th>{{ 'Document class' | trans }}</th>
                 <th>{{ 'Name' | trans }}</th>
-                <th>{{ 'Actions' | trans }}</th>
+                <th class="w-25">{{ 'Actions' | trans }}</th>
             </tr>
         </thead>
         <tbody>
@@ -23,7 +23,7 @@
                 <td>{{ document_category.documentClass }}</td>
                 <td>{{ document_category.name | localize_translatable_string}}</td>
 
-                <td>
+                <td class="text-end">
                     <a href="{{ path('document_category_show', {'bundleId': document_category.bundleId, 'idInsideBundle': document_category.idInsideBundle}) }}"
                        class="btn btn-show" title="{{ 'show' | trans }}"></a>
                     <a href="{{ path('document_category_edit', {'bundleId': document_category.bundleId, 'idInsideBundle': document_category.idInsideBundle}) }}"
diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_edit_content.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_edit_content.html.twig
index e23949162..0bfa5d54b 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_edit_content.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_edit_content.html.twig
@@ -1,7 +1,7 @@
     {% set formId = crudMainFormId|default('crud_main_form') %}
     
     {% block crud_content_header %}
-        <h1>{{ ('crud.'~crud_name~'.title_edit')|trans }}</h1>
+        <h1 class="mb-5">{{ ('crud.'~crud_name~'.title_edit')|trans }}</h1>
     {% endblock crud_content_header %}
 
     {% block crud_content_form %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_index.html.twig
index eaacc1f73..81e29a52e 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/CRUD/_index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/CRUD/_index.html.twig
@@ -14,7 +14,7 @@
     {% endblock %}
 {% else %}
     {% block table_entities %}
-    <table class="table table-bordered border-dark">
+    <table class="table table-bordered border-dark align-middle">
         <thead>
             <tr>
                 {% block table_entities_thead_tr %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig
index efbdc60d4..4ac863ee6 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/edit.html.twig
@@ -4,7 +4,7 @@
     {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
         {% block crud_content_after_form %}
             {% if access_permissions_group_list %}
-                <h2>{{ 'Permissions granted'|trans }}</h2>
+                <h2 class="mt-5">{{ 'Permissions granted'|trans }}</h2>
 
                 {% if entity.groupcenters|length > 0 %}
                     <table class="table table-bordered border-dark align-middle mb-5">
@@ -28,9 +28,9 @@
                                         {{ groupcenter.center.name }}
                                     </span>
                                 </td>
-                                <td>
+                                <td class="w-25 text-end">
                                     {{ form_start(delete_groupcenter_form[groupcenter.id]) }}
-                                    {{ form_row(delete_groupcenter_form[groupcenter.id].submit, { 'attr': { 'class': 'btn btn-remove' } } ) }}
+                                    {{ form_widget(delete_groupcenter_form[groupcenter.id].submit, { 'attr': { 'class': 'btn btn-remove' } } ) }}
                                     {{ form_rest(delete_groupcenter_form[groupcenter.id]) }}
                                     {{ form_end(delete_groupcenter_form[groupcenter.id]) }}
                                 </td>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
index b57e17c06..e4e7d70d8 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
@@ -69,19 +69,20 @@
                     </td>
                     <td>
                         <ul class="record_actions">
+
+                            {% if is_granted('ROLE_ALLOWED_TO_SWITCH') %}
+                                <li>
+                                    <a class="btn btn-chill-blue" href="{{ path('chill_main_homepage', {'_switch_user': entity.username }) }}" title="{{ "Impersonate"|trans|e('html_attr') }}"><i class="fa fa-user-secret"></i></a>
+                                </li>
+                            {% endif %}
+
                             <li>
                                 <a class="btn btn-edit" title="{{ 'Edit'|trans }}" href="{{ path('chill_crud_admin_user_edit', { 'id': entity.id }) }}"></a>
                             </li>
 
                             {% if allow_change_password is same as(true) %}
                                 <li>
-                                    <a class="btn btn-chill-red" href="{{ path('admin_user_edit_password',  { 'id' : entity.id }) }}" title="{{ 'Edit password'|trans|e('html_attr') }}"><i class="fa fa-ellipsis-h"></i></a>
-                                </li>
-                            {% endif %}
-
-                            {% if is_granted('ROLE_ALLOWED_TO_SWITCH') %}
-                                <li>
-                                    <a class="btn btn-chill-blue" href="{{ path('chill_main_homepage', {'_switch_user': entity.username }) }}" title="{{ "Impersonate"|trans|e('html_attr') }}"><i class="fa fa-user-secret"></i></a>
+                                    <a class="btn btn-reset" href="{{ path('admin_user_edit_password',  { 'id' : entity.id }) }}" title="{{ 'Edit password'|trans|e('html_attr') }}"><i class="fa fa-key-modern"></i></a>
                                 </li>
                             {% endif %}
                         </ul>
diff --git a/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
index e8ea9ec38..3902b33cf 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/UserJob/index.html.twig
@@ -2,14 +2,14 @@
 
 {% block admin_content %}
     {% embed '@ChillMain/CRUD/_index.html.twig' %}
-        
+
         {% block table_entities_thead_tr %}
             <th>id</th>
             <th>{{ 'Label'|trans }}</th>
             <th>{{ 'Active'|trans }}</th>
             <th>{{ 'Actions'|trans }}</th>
         {% endblock %}
-        
+
         {% block table_entities_tbody %}
             {% for entity in entities %}
                 <tr>
@@ -25,19 +25,19 @@
                     <td>
                         <ul class="record_actions">
                             <li>
-                                <a href="{{ chill_path_add_return_path('chill_crud_admin_user_job_edit', { 'id': entity.id}) }}" class="btn btn-sm btn-edit btn-mini"></a>
+                                <a href="{{ chill_path_add_return_path('chill_crud_admin_user_job_edit', { 'id': entity.id}) }}" class="btn btn-edit"></a>
                             </li>
                         </ul>
                     </td>
                 </tr>
              {% endfor %}
         {% endblock %}
-        
+
         {% block actions_before %}
             <li class='cancel'>
                 <a href="{{ path('chill_main_admin_central') }}" class="btn btn-cancel">{{'Back to the admin'|trans}}</a>
             </li>
         {% endblock %}
-        
+
     {% endembed %}
 {% endblock %}