diff --git a/modules/web-toolkit/src/com/haulmont/cuba/toolkit/gwt/client/ui/VGroupBox.java b/modules/web-toolkit/src/com/haulmont/cuba/toolkit/gwt/client/ui/VGroupBox.java
index 4777546962..d62827c7a0 100644
--- a/modules/web-toolkit/src/com/haulmont/cuba/toolkit/gwt/client/ui/VGroupBox.java
+++ b/modules/web-toolkit/src/com/haulmont/cuba/toolkit/gwt/client/ui/VGroupBox.java
@@ -156,14 +156,6 @@ public class VGroupBox extends VPanel {
         return 0;
     }
 
-    @Override
-    protected int getCaptionContainerOffsetHeight() {
-        if (captionVisible)
-            return captionNode.getOffsetHeight();
-        else
-            return 0;
-    }
-
     @Override
     protected void detectContainerBorders() {
         if (isAttached()) {
diff --git a/modules/web/css/VAADIN/themes/havana/groupbox/groupbox.css b/modules/web/css/VAADIN/themes/havana/groupbox/groupbox.css
index 1c48a8cfef..52d671e0cb 100644
--- a/modules/web/css/VAADIN/themes/havana/groupbox/groupbox.css
+++ b/modules/web/css/VAADIN/themes/havana/groupbox/groupbox.css
@@ -21,7 +21,7 @@
 .group-box > fieldset {
     border: 1px solid #babfc0;
     margin: 0;
-    padding: 5px 10px 10px;
+    padding: 5px 5px 5px;
 }
 
 .group-box.group-box-nocaption > fieldset {
diff --git a/modules/web/css/VAADIN/themes/peyto/groupbox/groupbox.css b/modules/web/css/VAADIN/themes/peyto/groupbox/groupbox.css
index 10fdc16c3b..cd12a31c4a 100644
--- a/modules/web/css/VAADIN/themes/peyto/groupbox/groupbox.css
+++ b/modules/web/css/VAADIN/themes/peyto/groupbox/groupbox.css
@@ -23,7 +23,7 @@
 .group-box > fieldset {
     border: 1px solid #babfc0;
     margin: 0;
-    padding: 5px 10px 10px;
+    padding: 5px 5px 5px;
 }
 
 .group-box legend {