diff --git a/assets/css/scss/atoms/_color_picker.scss b/assets/css/scss/atoms/_color_picker.scss
index 7a6e0f3456..d422c2aeed 100644
--- a/assets/css/scss/atoms/_color_picker.scss
+++ b/assets/css/scss/atoms/_color_picker.scss
@@ -1,5 +1,5 @@
 .color-picker {
-  @apply flex flex-col justify-center gap-0 relative;
+  @apply flex flex-col flex-grow-0 flex-shrink-0 basis-0 justify-center gap-0 relative;
 
   label {
     @apply absolute -top-2.5 left-2 text-caption px-1 bg-white text-primary z-[2] max-w-full truncate;
diff --git a/assets/css/scss/atoms/_form.scss b/assets/css/scss/atoms/_form.scss
index d6fde4631b..294fd22875 100644
--- a/assets/css/scss/atoms/_form.scss
+++ b/assets/css/scss/atoms/_form.scss
@@ -58,10 +58,14 @@
   > small {
     @apply text-caption text-primary;
   }
+
+  &-group {
+    @apply flex gap-4 flex-wrap mb-4 items-start;
+  }
 }
 
 .p-error {
-  @apply text-error;
+  @apply text-error text-caption;
 }
 
 .p-disabled {