diff --git a/assets/css/scss/atoms/_buttons.scss b/assets/css/scss/atoms/_buttons.scss
index fa2a74711c..a212c7f3ee 100644
--- a/assets/css/scss/atoms/_buttons.scss
+++ b/assets/css/scss/atoms/_buttons.scss
@@ -1,6 +1,9 @@
 .btn {
-  @apply cursor-default font-semibold gap-2 inline-flex justify-center px-6 py-2 rounded-md transition flex-none;
-  font-size: 16px;
+  @apply cursor-default font-semibold gap-2 inline-flex justify-center px-6 py-2 rounded-md transition flex-none text-base;
+
+  .mdi {
+    @apply text-base;
+  }
 
   &--primary {
     @apply bg-primary text-white;
@@ -231,8 +234,6 @@ $border-color_12: #9333EA;
   @include filled-style('primary', 'support-4');
   @apply cursor-pointer font-semibold gap-2 inline-flex justify-center items-center px-4 py-2 rounded-md transition;
 
-  font-size: 16px;
-
   &:focus {
     @apply outline-none;
   }
@@ -259,16 +260,28 @@ $border-color_12: #9333EA;
 
   &.p-button-sm {
     @apply px-2 py-1;
-    font-size: 13px;
+
+    .p-button-icon,
+    .p-button-label {
+      font-size: 13px;
+    }
   }
 
   &.p-button-lg {
     @apply px-8 py-4;
-    font-size: 18px;
+
+    .p-button-icon,
+    .p-button-label {
+      font-size: 18px;
+    }
+  }
+
+  .p-button-icon {
+    @apply text-base;
   }
 
   .p-button-label {
-    @apply align-middle font-semibold;
+    @apply align-middle font-semibold text-base;
   }
 
   &.p-button-icon-only {
@@ -289,7 +302,7 @@ $border-color_12: #9333EA;
         @apply bg-gray-10;
 
         .p-button-label {
-          text-decoration: underline;
+          @apply underline;
         }
       }
     }
diff --git a/assets/css/scss/molecules/_course_tool.scss b/assets/css/scss/molecules/_course_tool.scss
index 0a985c8d29..aa80ff4641 100644
--- a/assets/css/scss/molecules/_course_tool.scss
+++ b/assets/css/scss/molecules/_course_tool.scss
@@ -13,13 +13,9 @@
   &__icon {
     @apply text-transparent bg-clip-text bg-gradient-to-br from-primary to-primary-gradient leading-none;
 
-    &,
     &.mdi {
       font-size: 52px;
     }
-
-    &::before {
-    }
   }
 
   &__title {
diff --git a/assets/css/scss/molecules/_empty_state.scss b/assets/css/scss/molecules/_empty_state.scss
index 8216f46c4c..9f7b783bde 100644
--- a/assets/css/scss/molecules/_empty_state.scss
+++ b/assets/css/scss/molecules/_empty_state.scss
@@ -7,7 +7,11 @@
     }
 
     &__icon {
-      @apply mb-4 text-9xl text-transparent bg-clip-text bg-gradient-to-br from-primary to-primary-gradient w-32 h-32;
+      @apply mb-4 text-transparent bg-clip-text bg-gradient-to-br from-primary to-primary-gradient w-32 h-32;
+
+      &.mdi {
+        font-size: 8rem;
+      }
     }
 
     &__summary {
diff --git a/assets/css/scss/molecules/_toolbar.scss b/assets/css/scss/molecules/_toolbar.scss
index 050c6fc215..30831805af 100644
--- a/assets/css/scss/molecules/_toolbar.scss
+++ b/assets/css/scss/molecules/_toolbar.scss
@@ -3,7 +3,7 @@
 
   &-group-left,
   &-group-right {
-    @apply flex flex-row flex-wrap gap-2;
+    @apply flex flex-row flex-wrap gap-2 items-center;
   }
 
   &-separator {
diff --git a/public/main/inc/lib/formvalidator/FormValidator.class.php b/public/main/inc/lib/formvalidator/FormValidator.class.php
index e39b6642be..85fe7c9bb6 100644
--- a/public/main/inc/lib/formvalidator/FormValidator.class.php
+++ b/public/main/inc/lib/formvalidator/FormValidator.class.php
@@ -50,10 +50,8 @@ class FormValidator extends HTML_QuickForm
 
         switch ($layout) {
             case self::LAYOUT_BOX_SEARCH:
-                $attributes['class'] = 'form--search';
-                break;
             case self::LAYOUT_INLINE:
-                $attributes['class'] = 'flex flex-row gap-3 ';
+                $attributes['class'] = 'flex flex-row gap-3 items-center ';
                 break;
             case self::LAYOUT_BOX:
                 $attributes['class'] = 'ch flex gap-1 ';