diff --git a/modules/web/themes/havana/components/fieldgrouplayout/fieldgrouplayout.scss b/modules/web/themes/havana/components/fieldgrouplayout/fieldgrouplayout.scss
index 2463b3b836..e033bba079 100644
--- a/modules/web/themes/havana/components/fieldgrouplayout/fieldgrouplayout.scss
+++ b/modules/web/themes/havana/components/fieldgrouplayout/fieldgrouplayout.scss
@@ -46,12 +46,18 @@
     padding-bottom: 0;
   }
 
-  // set line-height 25px for all captions exclude captions for CheckBox and Label
-  .#{$primary-stylename}-slot.c-full-height-widget .v-caption {
-    height: 25px;
-  }
+  .#{$primary-stylename}-slot.c-full-height-widget {
+    .v-caption {
+      height: 25px;
 
-  .#{$primary-stylename}-slot.c-full-height-widget .v-caption .v-captiontext {
-    line-height: 25px;
+      .v-captiontext {
+        line-height: 25px;
+      }
+    }
+
+    & > .v-checkbox {
+      height: 25px;
+      line-height: 25px;
+    }
   }
 }
\ No newline at end of file
diff --git a/modules/web/themes/havana/components/pickerfield/pickerfield.scss b/modules/web/themes/havana/components/pickerfield/pickerfield.scss
index 9e07dde041..5d1b1dddc0 100644
--- a/modules/web/themes/havana/components/pickerfield/pickerfield.scss
+++ b/modules/web/themes/havana/components/pickerfield/pickerfield.scss
@@ -85,15 +85,15 @@
       opacity: 0.3;
     }
 
-    .v-readonly.v-textfield.v-textfield-focus,
-    .v-textfield-readonly.v-textfield-focus,
     .v-textfield-focus {
       border-color: $cuba-field-focused-border-color;
     }
 
     .v-readonly.v-textfield,
-    .v-textfield-readonly {
-      border: 1px solid $cuba-field-border-color;
+    .v-textfield-readonly,
+    .v-readonly.v-textfield.v-textfield-focus,
+    .v-textfield-readonly.v-textfield-focus {
+      border: 1px solid $cuba-field-readonly-border-color;
       overflow: hidden;
     }
 
@@ -102,7 +102,7 @@
     }
   }
 
-  .#{$primary-stylename}-layout.v-readonly {
+  .#{$primary-stylename}.v-readonly {
     background-color: transparent;
 
     .v-button {