diff --git a/css/ept_settings-olivero.css b/css/ept_settings-olivero.css
index 6dac92a630111e9312c18ea3bdd8c06d612370bc..ea6ffe5f4a56b19efe236e11096c059bf220dacb 100644
--- a/css/ept_settings-olivero.css
+++ b/css/ept_settings-olivero.css
@@ -145,4 +145,12 @@
   padding-left: 5px;
   padding-right: 5px;
   width: 30px;
-}
\ No newline at end of file
+}
+
+.olivero-details__wrapper .design-options__padding-box {
+  top: 2px;
+}
+
+.olivero-details__wrapper .design-options__border-box {
+  top: 6px;
+}
diff --git a/css/ept_settings.css b/css/ept_settings.css
index 77e758f76f92a888def155129f5a4d5f31b6a276..fca8cf21078efabf279fdf7aaff50b6d0b3142c8 100644
--- a/css/ept_settings.css
+++ b/css/ept_settings.css
@@ -144,11 +144,14 @@ td .design-options__margin-box .form-item {
 .design-options__margin-box .form-item label {
   display: none !important;
 }
+
 .design-options__margin-box input[type=text] {
   width: 45px !important;
   padding: 7px;
   height: 30px;
+  min-height: 30px;
 }
+
 .design-options__margin-box label {
   margin: 0;
 }
@@ -165,108 +168,36 @@ td .design-options__margin-box .form-item {
   height: 350px;
 }
 
-.form-item-settings-block-form-field-ept-settings-0-ept-settings-design-options-box1-margin-top,
-.form-item--field-components-0-subform-field-ept-settings-0-ept-settings-design-options-box1-margin-top,
-.js-form-item-settings-block-form-field-ept-settings-0-ept-settings-design-options-box1-margin-top,
-.form-item-field-ept-settings-0-ept-settings-design-options-box1-margin-top,
-.js-form-item-field-ept-settings-0-ept-settings-design-options-box1-margin-top,
-.form-item--field-ept-settings-0-ept-settings-design-options-box1-margin-top,
-.js-form-item--field-ept-settings-0-ept-settings-design-options-box1-margin-top,
-.form-item-settings-block-form-field-ept-settings-0-ept-settings-design-options-box1-box2-border-top,
-.form-item--field-components-0-subform-field-ept-settings-0-ept-settings-design-options-box1-box2-border-top,
-.js-form-item-settings-block-form-field-ept-settings-0-ept-settings-design-options-box1-box2-border-top,
-.form-item-field-ept-settings-0-ept-settings-design-options-box1-box2-border-top,
-.js-form-item-field-ept-settings-0-ept-settings-design-options-box1-box2-border-top,
-.form-item--field-ept-settings-0-ept-settings-design-options-box1-box2-border-top,
-.js-form-item--field-ept-settings-0-ept-settings-design-options-box1-box2-border-top,
-.form-item-settings-block-form-field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-top,
-.form-item--field-components-0-subform-field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-top,
-.js-form-item-settings-block-form-field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-top,
-.form-item-field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-top,
-.js-form-item-field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-top,
-.form-item--field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-top,
-.js-form-item--field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-top {
+div[class$="design-options-box1-margin-top"],
+div[class$="design-options-box1-box2-border-top"],
+div[class$="design-options-box1-box2-box3-padding-top"] {
   position: absolute;
   left: 50%;
   margin-left: -14px !important;
   top: 3px;
 }
 
-.form-item-settings-block-form-field-ept-settings-0-ept-settings-design-options-box1-margin-right,
-.form-item--field-components-0-subform-field-ept-settings-0-ept-settings-design-options-box1-margin-right,
-.js-form-item-settings-block-form-field-ept-settings-0-ept-settings-design-options-box1-margin-right,
-.form-item-field-ept-settings-0-ept-settings-design-options-box1-margin-right,
-.js-form-item-field-ept-settings-0-ept-settings-design-options-box1-margin-right,
-.form-item--field-ept-settings-0-ept-settings-design-options-box1-margin-right,
-.js-form-item--field-ept-settings-0-ept-settings-design-options-box1-margin-right,
-.form-item-settings-block-form-field-ept-settings-0-ept-settings-design-options-box1-box2-border-right,
-.form-item--field-components-0-subform-field-ept-settings-0-ept-settings-design-options-box1-box2-border-right,
-.js-form-item-settings-block-form-field-ept-settings-0-ept-settings-design-options-box1-box2-border-right,
-.form-item-field-ept-settings-0-ept-settings-design-options-box1-box2-border-right,
-.js-form-item-field-ept-settings-0-ept-settings-design-options-box1-box2-border-right,
-.form-item--field-ept-settings-0-ept-settings-design-options-box1-box2-border-right,
-.js-form-item--field-ept-settings-0-ept-settings-design-options-box1-box2-border-right,
-.form-item-settings-block-form-field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-right,
-.form-item--field-components-0-subform-field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-right,
-.js-form-item-settings-block-form-field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-right,
-.form-item-field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-right,
-.js-form-item-field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-right,
-.form-item--field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-right,
-.js-form-item--field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-right {
+div[class$="design-options-box1-margin-right"],
+div[class$="design-options-box1-box2-border-right"],
+div[class$="design-options-box1-box2-box3-padding-right"] {
   position: absolute;
   right: 3px;
   top: 50%;
   margin-top: -14px !important;
 }
 
-.form-item-settings-block-form-field-ept-settings-0-ept-settings-design-options-box1-margin-bottom,
-.form-item--field-components-0-subform-field-ept-settings-0-ept-settings-design-options-box1-margin-bottom,
-.js-form-item-settings-block-form-field-ept-settings-0-ept-settings-design-options-box1-margin-bottom,
-.form-item-field-ept-settings-0-ept-settings-design-options-box1-margin-bottom,
-.js-form-item-field-ept-settings-0-ept-settings-design-options-box1-margin-bottom,
-.form-item--field-ept-settings-0-ept-settings-design-options-box1-margin-bottom,
-.js-form-item--field-ept-settings-0-ept-settings-design-options-box1-margin-bottom,
-.form-item-settings-block-form-field-ept-settings-0-ept-settings-design-options-box1-box2-border-bottom,
-.form-item--field-components-0-subform-field-ept-settings-0-ept-settings-design-options-box1-box2-border-bottom,
-.js-form-item-settings-block-form-field-ept-settings-0-ept-settings-design-options-box1-box2-border-bottom,
-.form-item-field-ept-settings-0-ept-settings-design-options-box1-box2-border-bottom,
-.js-form-item-field-ept-settings-0-ept-settings-design-options-box1-box2-border-bottom,
-.form-item--field-ept-settings-0-ept-settings-design-options-box1-box2-border-bottom,
-.js-form-item--field-ept-settings-0-ept-settings-design-options-box1-box2-border-bottom,
-.form-item-settings-block-form-field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-bottom,
-.form-item--field-components-0-subform-field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-bottom,
-.js-form-item-settings-block-form-field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-bottom,
-.form-item-field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-bottom,
-.js-form-item-field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-bottom,
-.form-item--field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-bottom,
-.js-form-item--field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-bottom {
+div[class$="design-options-box1-margin-bottom"],
+div[class$="design-options-box1-box2-border-bottom"],
+div[class$="design-options-box1-box2-box3-padding-bottom"] {
   position: absolute;
   left: 50%;
   margin-left: -14px !important;
   bottom: 3px;
 }
 
-.form-item-settings-block-form-field-ept-settings-0-ept-settings-design-options-box1-margin-left,
-.form-item--field-components-0-subform-field-ept-settings-0-ept-settings-design-options-box1-margin-left,
-.js-form-item-settings-block-form-field-ept-settings-0-ept-settings-design-options-box1-margin-left,
-.form-item-field-ept-settings-0-ept-settings-design-options-box1-margin-left,
-.js-form-item-field-ept-settings-0-ept-settings-design-options-box1-margin-left,
-.form-item--field-ept-settings-0-ept-settings-design-options-box1-margin-left,
-.js-form-item--field-ept-settings-0-ept-settings-design-options-box1-margin-left,
-.form-item-settings-block-form-field-ept-settings-0-ept-settings-design-options-box1-box2-border-left,
-.form-item--field-components-0-subform-field-ept-settings-0-ept-settings-design-options-box1-box2-border-left,
-.js-form-item-settings-block-form-field-ept-settings-0-ept-settings-design-options-box1-box2-border-left,
-.form-item-field-ept-settings-0-ept-settings-design-options-box1-box2-border-left,
-.js-form-item-field-ept-settings-0-ept-settings-design-options-box1-box2-border-left,
-.form-item--field-ept-settings-0-ept-settings-design-options-box1-box2-border-left,
-.js-form-item--field-ept-settings-0-ept-settings-design-options-box1-box2-border-left,
-.form-item-settings-block-form-field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-left,
-.form-item--field-components-0-subform-field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-left,
-.js-form-item-settings-block-form-field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-left,
-.form-item-field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-left,
-.js-form-item-field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-left,
-.form-item--field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-left,
-.js-form-item--field-ept-settings-0-ept-settings-design-options-box1-box2-box3-padding-left {
+div[class$="design-options-box1-margin-left"],
+div[class$="design-options-box1-box2-border-left"],
+div[class$="design-options-box1-box2-box3-padding-left"] {
   position: absolute;
   left: 3px;
   top: 50%;
@@ -481,4 +412,5 @@ body.js-off-canvas-dialog-open #drupal-off-canvas .horizontal-tabs .horizontal-t
   .js-off-canvas-dialog-open .ui-widget.ui-dialog.ui-dialog-off-canvas {
     width: 620px !important;
   }
-}
\ No newline at end of file
+}
+