diff --git a/css/backoffice/components/_field.scss b/css/backoffice/components/_field.scss
index 99f70504de..7e59ce3240 100644
--- a/css/backoffice/components/_field.scss
+++ b/css/backoffice/components/_field.scss
@@ -3,20 +3,21 @@
  * license     http://opensource.org/licenses/AGPL-3.0
  */
 
-$ibo-field-value--color: $ibo-color-grey-700 !default;
+$ibo-field--sibling-spacing: 16px !default;
+$ibo-field--value--color: $ibo-color-grey-700 !default;
 
 .ibo-field {
   @extend %ibo-font-ral-nor-150;
 
   & ~ .ibo-field {
-    margin-top: 10px;
+    margin-top: $ibo-field--sibling-spacing;
   }
 }
 
 .ibo-field-large {
   display: inherit;
 
-  .ibo-field-label {
+  .ibo-field--label {
     display: inherit;
   }
 }
@@ -25,21 +26,21 @@ $ibo-field-value--color: $ibo-color-grey-700 !default;
   display: table;
   width: 100%;
 
-  .ibo-field-label {
+  .ibo-field--label {
     display: table-cell;
     vertical-align: top;
   }
 }
 
-.ibo-field-label {
+.ibo-field--label {
   min-width: 100px;
   max-width: 145px;
   width: 30%;
   padding-right: 10px;
 }
 
-.ibo-field-value {
+.ibo-field--value {
   display: table;
   width: 100%;
-  color: $ibo-field-value--color;
+  color: $ibo-field--value--color;
 }
\ No newline at end of file
diff --git a/css/backoffice/components/_fieldset.scss b/css/backoffice/components/_fieldset.scss
index 1fe543ddd8..e03008b9a2 100644
--- a/css/backoffice/components/_fieldset.scss
+++ b/css/backoffice/components/_fieldset.scss
@@ -3,19 +3,25 @@
  * license     http://opensource.org/licenses/AGPL-3.0
  */
 
-.ibo-fieldset {
+$ibo-fieldset--sibling-spacing: 48px !default;
 
+$ibo-fieldset--legend--width: 100% !default;
+$ibo-fieldset--legend--margin-bottom: 16px !default;
+$ibo-fieldset--legend--padding-bottom: 4px !default;
+$ibo-fieldset--legend--border-bottom-size: 2px !default;
+$ibo-fieldset--legend--border-bottom-color: $ibo-color-grey-500 !default;
+$ibo-fieldset--legend--border-bottom-style: solid !default;
+
+.ibo-fieldset {
   & ~ .ibo-fieldset {
-    margin-top: 20px;
+    margin-top: $ibo-fieldset--sibling-spacing;
   }
 }
-
-
 .ibo-fieldset-legend {
+  width: $ibo-fieldset--legend--width;
+  margin-bottom: $ibo-fieldset--legend--margin-bottom;
+  padding-bottom: $ibo-fieldset--legend--padding-bottom;
+  border-bottom: $ibo-fieldset--legend--border-bottom-size $ibo-fieldset--legend--border-bottom-style $ibo-fieldset--legend--border-bottom-color;
+
   @extend %ibo-font-ral-med-250;
 }
-
-.ibo-fieldset-legend-separator {
-  height: 2px;
-  background: $ibo-color-grey-500;
-}
\ No newline at end of file
diff --git a/css/backoffice/layout/multi-column/_column.scss b/css/backoffice/layout/multi-column/_column.scss
index 8da85c5580..7c688bd79e 100644
--- a/css/backoffice/layout/multi-column/_column.scss
+++ b/css/backoffice/layout/multi-column/_column.scss
@@ -7,7 +7,7 @@ $ibo-column--min-width: 300px !default;
 $ibo-column--padding-x: abs($ibo-multi-column--margin-x) !default;
 $ibo-column--padding-y: 0 !default;
 
-$ibo-column--margin-bottom--is-last-element: 20px !default;
+$ibo-column--margin-bottom--is-last-element: 48px !default;
 
 .ibo-column {
   min-width: $ibo-column--min-width;
@@ -16,7 +16,7 @@ $ibo-column--margin-bottom--is-last-element: 20px !default;
   padding: $ibo-column--padding-y $ibo-column--padding-x;
   flex-basis: 10%;
 
-  :not(:last-child){
+  &:not(:last-child){
     margin-bottom: $ibo-column--margin-bottom--is-last-element;
   }
 }
diff --git a/templates/components/field/layout.html.twig b/templates/components/field/layout.html.twig
index 019b27d244..be2f50386c 100644
--- a/templates/components/field/layout.html.twig
+++ b/templates/components/field/layout.html.twig
@@ -1,5 +1,5 @@
 {% set aParams = oUIBlock.GetParams() %}
 <div class="ibo-field ibo-field-{{ aParams.layout }}">
-    <div class="ibo-field-label">{{ aParams.label|raw }}</div>
-    <div class="ibo-field-value">{{ aParams.value|raw }}</div>
+    <div class="ibo-field--label">{{ aParams.label|raw }}</div>
+    <div class="ibo-field--value">{{ aParams.value|raw }}</div>
 </div>
\ No newline at end of file
diff --git a/templates/components/fieldset/layout.html.twig b/templates/components/fieldset/layout.html.twig
index c3a0d4a221..30b7b388b9 100644
--- a/templates/components/fieldset/layout.html.twig
+++ b/templates/components/fieldset/layout.html.twig
@@ -1,7 +1,6 @@
 {% if oUIBlock.GetSubBlocks() %}
 <fieldset class="ibo-fieldset">
     <legend class="ibo-fieldset-legend">{{ oUIBlock.GetLegend() }}</legend>
-    <hr class="ibo-fieldset-legend-separator">
     {% for oSubBlock in oUIBlock.GetSubBlocks() %}
         {{ render_block(oSubBlock, {aPage: aPage}) }}
     {% endfor %}