diff --git a/assets/css/easyadmin-theme/forms.css b/assets/css/easyadmin-theme/forms.css
index e6ee00d2d1..66f377d7bd 100644
--- a/assets/css/easyadmin-theme/forms.css
+++ b/assets/css/easyadmin-theme/forms.css
@@ -357,6 +357,11 @@ label.form-check-label {
 }
 
 /* Form columns */
+.form-column {
+    display: flex;
+    flex-direction: column;
+    gap: var(--bs-gutter-x);
+}
 .form-column .form-column-title {
     display: flex;
     flex-direction: column;
@@ -381,9 +386,6 @@ label.form-check-label {
     flex: 1;
     margin: 0;
 }
-.form-column .field-form_fieldset {
-    margin-block-end: var(--bs-gutter-x);
-}
 
 .form-column .form-fieldset {
     border-radius: var(--border-radius);
@@ -412,10 +414,6 @@ label.form-check-label {
 }
 
 /* Form fieldsets */
-.field-form_fieldset {
-    margin-block-end: calc(1.5 * var(--bs-gutter-x)); /* not a typo; don't use --bs-gutter-y here */
-}
-
 .form-section-empty {
     padding: 25px 10px 25px;
 }
diff --git a/templates/crud/detail.html.twig b/templates/crud/detail.html.twig
index 9985985b73..4208b7ea00 100644
--- a/templates/crud/detail.html.twig
+++ b/templates/crud/detail.html.twig
@@ -172,7 +172,7 @@
             </div>
         {% endif %}
 
-        <div class="row">
+        <div class="row g-4">
 {% endmacro %}
 
 {% macro render_tab_close(field) %}
@@ -183,7 +183,7 @@
 {% macro render_column_group_open(field) %}
     {# if columns are inside tabs, don't add a '.row' element because the tab pane already opens it #}
     {% if not field.getFormTypeOption('ea_is_inside_tab')|default(false) %}
-        <div class="row">
+        <div class="row g-4">
     {% endif %}
 {% endmacro %}
 
diff --git a/templates/crud/form_theme.html.twig b/templates/crud/form_theme.html.twig
index 8f9b3bc2f5..2fc0137f2e 100644
--- a/templates/crud/form_theme.html.twig
+++ b/templates/crud/form_theme.html.twig
@@ -449,7 +449,7 @@
 {% block ea_form_column_group_open_row %}
     {# if columns are inside tabs, don't add a '.row' element because the tab pane already opens it #}
     {% if not form.vars.ea_is_inside_tab|default(false) %}
-        <div class="row">
+        <div class="row g-4">
     {% endif %}
 {% endblock ea_form_column_group_open_row %}
 
@@ -599,7 +599,7 @@
             </div>
         {% endif %}
 
-        <div class="row">
+        <div class="row g-4">
 {% endblock ea_form_tabpane_open_row %}
 
 {% block ea_form_tabpane_close_row %}