diff --git a/src/core/Resources/assets/css/admin.scss b/src/core/Resources/assets/css/admin.scss
index 436e65b..b07481e 100644
--- a/src/core/Resources/assets/css/admin.scss
+++ b/src/core/Resources/assets/css/admin.scss
@@ -538,13 +538,42 @@ fieldset.form-group {
 }
 
 .crud-header {
+    padding: 30px;
+
+    .btn-group:empty {
+        display: none;
+    }
+
+    @media screen and (max-width: 769px) {
+        padding: 10px;
+
+        .btn {
+            @include button-size($btn-padding-y-sm, $btn-padding-x-sm, $btn-font-size-sm, $btn-line-height-sm, $btn-border-radius-sm);
+        }
+    }
+
     &-title {
         font-size: 2em;
+
+        @media screen and (max-width: 769px) {
+            font-size: 1.5em;
+            text-align: center;
+            margin-bottom: 30px;
+        }
+    }
+
+    &-filter {
+        padding-right: 30px;
+        padding-bottom: 30px;
+
+        @media screen and (max-width: 769px) {
+            padding-right: 10px;
+            padding-bottom: 10px;
+        }
     }
 
     &-actions {
         text-align: right;
-        margin-bottom: 10px;
     }
 
     @media screen and (min-width: 770px) {
diff --git a/src/core/Resources/views/account/admin/edit.html.twig b/src/core/Resources/views/account/admin/edit.html.twig
index 047a765..90d03c4 100644
--- a/src/core/Resources/views/account/admin/edit.html.twig
+++ b/src/core/Resources/views/account/admin/edit.html.twig
@@ -5,7 +5,7 @@
 {% block title %}{{ 'My account'|trans }} - {{ parent() }}{% endblock %}
 
 {% block body %}
-    <div class="bg-light pl-5 pr-4 pt-5 pb-5">
+    <div class="bg-light">
         <div class="crud-header">
             <h1 class="crud-header-title">{{ 'My account'|trans }}</h1>
         </div>
diff --git a/src/core/Resources/views/admin/crud/edit.html.twig b/src/core/Resources/views/admin/crud/edit.html.twig
index 9561ba0..027b699 100644
--- a/src/core/Resources/views/admin/crud/edit.html.twig
+++ b/src/core/Resources/views/admin/crud/edit.html.twig
@@ -8,7 +8,7 @@
 
 {% block body %}
     {% block header %}
-        <div class="bg-light pl-5 pr-4 pt-5 pb-5">
+        <div class="bg-light">
             <div class="crud-header">
                 {% block header_title %}
                     <h1 class="crud-header-title">{{ configuration.pageTitle(context)|trans|build_string(entity) }}</h1>
diff --git a/src/core/Resources/views/admin/crud/index.html.twig b/src/core/Resources/views/admin/crud/index.html.twig
index 99b7c5a..352adcd 100644
--- a/src/core/Resources/views/admin/crud/index.html.twig
+++ b/src/core/Resources/views/admin/crud/index.html.twig
@@ -18,34 +18,34 @@
             {% endif %}
         {%- endset -%}
 
-        <div class="bg-light pl-5 pr-4 pt-5 {{ pb }}">
+        <div class="bg-light">
             <div class="crud-header">
                 {% block header_title %}
                     <h1 class="crud-header-title">{{ configuration.pageTitle(context)|trans }}</h1>
                 {% endblock %}
 
-                {% block header_actions %}
+                {%- block header_actions %}
                     <div class="crud-header-actions">
                         <div class="btn-group">
-                            {% block header_actions_before %}{% endblock %}
+                            {%- block header_actions_before %}{% endblock -%}
 
-                            {% if configuration.action(context, 'new', true) %}
+                            {%- if configuration.action(context, 'new', true) %}
                                 <a href="{{ path(configuration.pageRoute('new'), configuration.pageRouteParams('new')) }}" class="btn btn-primary">
                                     <span class="fa fa-plus pr-1"></span>
                                     <span class="d-none d-md-inline">
                                         {{ configuration.actionTitle(context, 'new', 'New')|trans }}
                                     </span>
                                 </a>
-                            {% endif %}
+                            {% endif -%}
 
-                            {% if header_actions_dropdown_menu is not defined %}
+                            {%- if header_actions_dropdown_menu is not defined %}
                                 {% set header_actions_dropdown_menu = '' %}
-                            {% endif %}
+                            {% endif -%}
 
-                            {% block header_actions_after %}{% endblock %}
+                            {%- block header_actions_after %}{% endblock -%}
 
-                            {% block header_actions_dropdown %}
-                                {% if header_actions_dropdown_menu %}
+                            {%- block header_actions_dropdown %}
+                                {%- if header_actions_dropdown_menu %}
                                     <button type="button" class="btn btn-white dropdown-toggle dropdown-toggle-hide-after" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
                                         <span class="font-weight-bold">
                                             ⋅⋅⋅
@@ -55,8 +55,8 @@
                                     <div class="dropdown-menu dropdown-menu-right">
                                         {{ header_actions_dropdown_menu|raw }}
                                     </div>
-                                {% endif %}
-                            {% endblock %}
+                                {% endif -%}
+                            {% endblock -%}
                         </div>
                     </div>
                 {% endblock %}
@@ -64,7 +64,7 @@
 
             {% block header_filter_pager %}
                 {% if filters.show %}
-                    <div class="row pb-3">
+                    <div class="row crud-header-filter">
                         <div class="col-auto ml-auto {% if pager.getPaginationData.pageCount > 1 %}mr-3{% endif %}">
                             <button data-modal="{{ path(configuration.pageRoute('filter'), configuration.pageRouteParams('filter')) }}" class="btn btn-sm btn-secondary">
                                 {{ 'Filter'|trans }} {% if not filters.isEmpty %}({{ 'yes'|trans }}){% endif %}
@@ -75,7 +75,9 @@
                         </div>
                     </div>
                 {% else %}
-                    {{ knp_pagination_render(pager) }}
+                    <div class="crud-header-filter">
+                        {{ knp_pagination_render(pager) }}
+                    </div>
                 {% endif %}
             {% endblock %}
         </div>
diff --git a/src/core/Resources/views/admin/crud/new.html.twig b/src/core/Resources/views/admin/crud/new.html.twig
index de2a6df..f3b8cfe 100644
--- a/src/core/Resources/views/admin/crud/new.html.twig
+++ b/src/core/Resources/views/admin/crud/new.html.twig
@@ -8,7 +8,7 @@
 
 {% block body %}
     {% block header %}
-        <div class="bg-light pl-5 pr-4 pt-5 pb-5">
+        <div class="bg-light">
             <div class="crud-header">
                 {% block header_title %}
                     <h1 class="crud-header-title">{{ configuration.pageTitle(context)|trans|build_string(entity) }}</h1>
diff --git a/src/core/Resources/views/admin/crud/show.html.twig b/src/core/Resources/views/admin/crud/show.html.twig
index d84bdf7..365653e 100644
--- a/src/core/Resources/views/admin/crud/show.html.twig
+++ b/src/core/Resources/views/admin/crud/show.html.twig
@@ -6,7 +6,7 @@
 
 {% block body %}
     {% block header %}
-        <div class="bg-light pl-5 pr-4 pt-5 pb-5">
+        <div class="bg-light">
             <div class="crud-header">
                 {% block header_title %}
                     <h1 class="crud-header-title">{{ configuration.pageTitle(context)|trans|build_string(entity) }}</h1>
diff --git a/src/core/Resources/views/file_manager/index.html.twig b/src/core/Resources/views/file_manager/index.html.twig
index cc4e0f2..219759e 100644
--- a/src/core/Resources/views/file_manager/index.html.twig
+++ b/src/core/Resources/views/file_manager/index.html.twig
@@ -1,7 +1,7 @@
 {% extends '@Core/admin/layout.html.twig' %}
 
 {% block body %}
-    <div class="bg-light pl-5 pr-4 pt-5 pb-5">
+    <div class="bg-light">
         <div class="d-flex">
             <div class="mr-auto w-50">
                 <h1 class="display-5">
diff --git a/src/core/Resources/views/setting/setting_admin/index.html.twig b/src/core/Resources/views/setting/setting_admin/index.html.twig
index 0ab6869..23ed354 100644
--- a/src/core/Resources/views/setting/setting_admin/index.html.twig
+++ b/src/core/Resources/views/setting/setting_admin/index.html.twig
@@ -3,7 +3,7 @@
 {% block title %}{{ 'Settings'|trans }} - {{ parent() }}{% endblock %}
 
 {% block body %}
-    <div class="bg-light pl-5 pr-4 pt-5 {% if pager.paginationData.pageCount < 2 %}pb-5{% endif %}">
+    <div class="bg-light">
         <div class="crud-header">
             <h1 class="crud-header-title">{{ 'Settings'|trans }}</h1>
         </div>
diff --git a/src/core/Resources/views/site/tree_admin/navigation.html.twig b/src/core/Resources/views/site/tree_admin/navigation.html.twig
index 9541242..a106cf6 100644
--- a/src/core/Resources/views/site/tree_admin/navigation.html.twig
+++ b/src/core/Resources/views/site/tree_admin/navigation.html.twig
@@ -3,7 +3,7 @@
 {% block title %}{{ 'Tree'|trans }} - {{ parent() }}{% endblock %}
 
 {% block body %}
-    <div class="bg-light pl-5 pr-4 pt-5 pb-5">
+    <div class="bg-light">
         <div class="crud-header">
             <div class="crud-header-title">
                 <button type="button" class="btn btn-outline-dark dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
diff --git a/src/core/Resources/views/task/task_admin/index.html.twig b/src/core/Resources/views/task/task_admin/index.html.twig
index 9080176..8600eda 100644
--- a/src/core/Resources/views/task/task_admin/index.html.twig
+++ b/src/core/Resources/views/task/task_admin/index.html.twig
@@ -3,7 +3,7 @@
 {% block title %}{{ 'Tasks'|trans }} - {{ parent() }}{% endblock %}
 
 {% block body %}
-    <div class="bg-light pl-5 pr-4 pt-5 pb-5">
+    <div class="bg-light">
         <div class="crud-header">
             <h1 class="crud-header-title">{{ 'Tasks'|trans }}</h1>
         </div>