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 cc69c639de..8a9f270301 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
@@ -176,13 +176,13 @@ public class VGroupBox extends VPanel {
             DOM.setStyleAttribute(contentNode, "height", "0px");
 
             borderPaddingHorizontal = contentNodeBorderPaddingsHor = contentNode.getOffsetWidth();
-            borderPaddingVertical = contentNodeBorderPaddingsVer = contentNode.getOffsetHeight();
+            borderPaddingVertical = contentNodeBorderPaddingsVer = contentNode.getOffsetHeight() / 2;
 
             DOM.setStyleAttribute(contentNode, "width", "");
             DOM.setStyleAttribute(contentNode, "height", "");
 
             borderPaddingHorizontal += (fieldset.getOffsetWidth() - contentNode.getOffsetWidth());
-            borderPaddingVertical += (fieldset.getOffsetHeight() - contentNode.getOffsetHeight());
+            borderPaddingVertical += (fieldset.getOffsetHeight() - contentNode.getOffsetHeight()) / 2;
 
             DOM.setStyleAttribute(contentNode, "width", oldWidth);
             DOM.setStyleAttribute(contentNode, "height", oldHeight);
diff --git a/modules/web-toolkit/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/modules/web-toolkit/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
index 1931777935..44de5397aa 100644
--- a/modules/web-toolkit/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
+++ b/modules/web-toolkit/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
@@ -117,6 +117,8 @@ public class ApplicationConnection {
 
     private int activeRequests = 0;
 
+    private VNotification errorNotification = null;
+
     /** Parameters for this application connection loaded from the web-page */
     private ApplicationConfiguration configuration;
 
@@ -691,16 +693,19 @@ public class ApplicationConnection {
         }
 
         if (html.length() > 0) {
-
             // Add error description
             html.append("<br/><p><I style=\"font-size:0.7em\">");
             html.append(details);
             html.append("</I></p>");
 
+            if (errorNotification != null)
+                errorNotification.hide();
+
             VNotification n = new VNotification(1000 * 60 * 45);
             n.addEventListener(new NotificationRedirect(url));
-            n.show(html.toString(), VNotification.CENTERED_TOP,
-                    VNotification.STYLE_SYSTEM);
+            n.show(html.toString(), VNotification.CENTERED_TOP, VNotification.STYLE_SYSTEM);
+
+            errorNotification = n;
         } else {
             redirect(url);
         }
diff --git a/modules/web/css/VAADIN/themes/havana/groupbox/groupbox.css b/modules/web/css/VAADIN/themes/havana/groupbox/groupbox.css
index 6e530e416a..1c48a8cfef 100644
--- a/modules/web/css/VAADIN/themes/havana/groupbox/groupbox.css
+++ b/modules/web/css/VAADIN/themes/havana/groupbox/groupbox.css
@@ -8,8 +8,6 @@
 }
 
 .group-box {
-    background: #fff;
-    padding-top: .5em; /*������������ ����� legend, ��� ����� ��� ��� �� ������� ������������� overflow: hidden*/
 }
 
 .group-box.group-box-nocollapsable.group-box-nocaption {
@@ -26,6 +24,10 @@
     padding: 5px 10px 10px;
 }
 
+.group-box.group-box-nocaption > fieldset {
+    border: none;
+}
+
 .group-box legend {
     margin: 0;
     padding: 0;
diff --git a/modules/web/css/VAADIN/themes/havana/menubar/menubar.css b/modules/web/css/VAADIN/themes/havana/menubar/menubar.css
index a0169f7b1d..6025d3625a 100644
--- a/modules/web/css/VAADIN/themes/havana/menubar/menubar.css
+++ b/modules/web/css/VAADIN/themes/havana/menubar/menubar.css
@@ -1,6 +1,14 @@
 .v-menubar {
 }
 
+.v-menubar:focus {
+    outline: none;
+}
+
+.v-menubar menuitem:focus {
+    outline: none;
+}
+
 .v-menubar table {
     font-family: verdana, tahoma, arial, geneva, helvetica, sans-serif;
     font-size: 11px;
diff --git a/modules/web/css/VAADIN/themes/havana/select/img/bg-center-filter-error.png b/modules/web/css/VAADIN/themes/havana/select/img/bg-center-filter-error.png
deleted file mode 100644
index 72f74f16ab..0000000000
Binary files a/modules/web/css/VAADIN/themes/havana/select/img/bg-center-filter-error.png and /dev/null differ
diff --git a/modules/web/css/VAADIN/themes/havana/select/img/bg-center-filter.gif b/modules/web/css/VAADIN/themes/havana/select/img/bg-center-filter.gif
deleted file mode 100644
index 3c380b022e..0000000000
Binary files a/modules/web/css/VAADIN/themes/havana/select/img/bg-center-filter.gif and /dev/null differ
diff --git a/modules/web/css/VAADIN/themes/havana/select/img/bg-left-filter-error.png b/modules/web/css/VAADIN/themes/havana/select/img/bg-left-filter-error.png
deleted file mode 100644
index da4a4e4cc9..0000000000
Binary files a/modules/web/css/VAADIN/themes/havana/select/img/bg-left-filter-error.png and /dev/null differ
diff --git a/modules/web/css/VAADIN/themes/havana/select/img/bg-right-filter-error.png b/modules/web/css/VAADIN/themes/havana/select/img/bg-right-filter-error.png
deleted file mode 100644
index 72ed791760..0000000000
Binary files a/modules/web/css/VAADIN/themes/havana/select/img/bg-right-filter-error.png and /dev/null differ
diff --git a/modules/web/css/VAADIN/themes/havana/select/img/bg-right-filter.gif b/modules/web/css/VAADIN/themes/havana/select/img/bg-right-filter.gif
deleted file mode 100644
index 9d82ce1dc2..0000000000
Binary files a/modules/web/css/VAADIN/themes/havana/select/img/bg-right-filter.gif and /dev/null differ
diff --git a/modules/web/css/VAADIN/themes/havana/select/img/select-fon.gif b/modules/web/css/VAADIN/themes/havana/select/img/select-fon.gif
deleted file mode 100644
index 4274cac5a3..0000000000
Binary files a/modules/web/css/VAADIN/themes/havana/select/img/select-fon.gif and /dev/null differ
diff --git a/modules/web/css/VAADIN/themes/havana/splitpanel/splitpanel.css b/modules/web/css/VAADIN/themes/havana/splitpanel/splitpanel.css
index 4d59283525..d4e5fc8846 100644
--- a/modules/web/css/VAADIN/themes/havana/splitpanel/splitpanel.css
+++ b/modules/web/css/VAADIN/themes/havana/splitpanel/splitpanel.css
@@ -33,9 +33,9 @@
 	margin: 0;
 }
 
-
-
-
+.v-splitpanel-horizontal .v-splitpanel-second-container {
+    margin-left: 1px;
+}
 
 /* IE specific styles */
 
diff --git a/modules/web/css/VAADIN/themes/havana/tabsheet/tabsheet.css b/modules/web/css/VAADIN/themes/havana/tabsheet/tabsheet.css
index 27b1498335..79e4aa6151 100644
--- a/modules/web/css/VAADIN/themes/havana/tabsheet/tabsheet.css
+++ b/modules/web/css/VAADIN/themes/havana/tabsheet/tabsheet.css
@@ -14,9 +14,8 @@
 .v-tabsheet-tabs {
 	empty-cells: hide;
 	border-collapse: collapse;
-	margin:0;
-    margin-top: 0;
-	padding:0;
+    margin: 0;
+    padding:0;
 	border:0;
 	height: 29px;
 	width: 100%;
@@ -24,7 +23,8 @@
     background: url(img/bg-top-tabseet.png) repeat-x bottom;
 }
 
-.v-tabsheet-content .v-tabsheet-tabs {
+.v-tabsheet-content .v-tabsheet-tabs,
+.v-window-contents .v-tabsheet-tabs {
     background: transparent url(img/bg-middle-tabseet.png) repeat-x bottom;
 }
 
@@ -42,7 +42,8 @@
     border-top: 0;
 	background: transparent;
 }
-.v-tabsheet-content .v-tabsheet-spacertd div {
+.v-tabsheet-content .v-tabsheet-spacertd div,
+.v-window-contents .v-tabsheet-spacertd div {
     border-bottom: 0;
 }
 
@@ -90,11 +91,11 @@
 }
 .v-tabsheet-scrollerPrev-disabled,
 .v-tabsheet-scrollerNext-disabled {
-	background-position: -12px 0px;
+	background-position: -12px 0;
 }
 .v-tabsheet-scrollerPrev-disabled:hover,
 .v-tabsheet-scrollerNext-disabled:hover {
-	background-position: -12px 0px;
+	background-position: -12px 0;
 
 }
 
@@ -127,7 +128,10 @@
     margin: 10px;
 }
 
-.v-tabsheet-content .v-tabsheet-tabs .v-tabsheet-tabitem-selected, .v-tabsheet-content .v-tabsheet-tabs .v-tabsheet-tabitem-selected-first{
+.v-tabsheet-content .v-tabsheet-tabs .v-tabsheet-tabitem-selected,
+.v-window-contents .v-tabsheet-tabs .v-tabsheet-tabitem-selected,
+.v-tabsheet-content .v-tabsheet-tabs .v-tabsheet-tabitem-selected-first,
+.v-window-contents .v-tabsheet-tabs .v-tabsheet-tabitem-selected-first {
     border-bottom: 0;
 }
 
@@ -154,7 +158,9 @@
 }
 
 .v-tabsheet-content .v-tabsheet-tabitem-selected-first,
-.v-tabsheet-content .v-tabsheet-tabitem-selected{
+.v-window-contents .v-tabsheet-tabitem-selected-first,
+.v-tabsheet-content .v-tabsheet-tabitem-selected,
+.v-window-contents  .v-tabsheet-tabitem-selected {
     background: #F5F7F9;
     border-color: #D2E3EE;
 }
@@ -173,7 +179,7 @@
 
 .v-tabsheet-tabitem-selected .v-caption {
 	background: none;
-	margin: 0 -1px 0 0px;
+	margin: 0 -1px 0 0;
 	padding: 2px 4px 5px 2px;
 	overflow: visible;
 }
@@ -186,7 +192,8 @@
     color: #1E3146;
 }
 
-.v-tabsheet-content .v-tabsheet-tabitem .v-caption .v-captiontext {
+.v-tabsheet-content .v-tabsheet-tabitem .v-caption .v-captiontext,
+.v-window-contents .v-tabsheet-tabitem .v-caption .v-captiontext {
     color:#1E3146;
 }
 
@@ -219,7 +226,8 @@
 	position: relative;
 }
 
-.v-tabsheet-content .v-tabsheet-content{
+.v-tabsheet-content .v-tabsheet-content,
+.v-window-contents .v-tabsheet-content {
     border-color: #D2E3EE;
     background: #F5F7F9;
 }
@@ -231,7 +239,7 @@
 .v-tabsheet-deco {
 	height: 1px;
 	background: none; /*transparent url(img/tab-sep.gif) repeat-x right top;*/
-	margin-left: 0px;
+	margin-left: 0;
 }
 
 .v-tabsheet-deco:before {
diff --git a/modules/web/css/VAADIN/themes/havana/window/img/win-body-bg.png b/modules/web/css/VAADIN/themes/havana/window/img/win-body-bg.png
index 72ba288de0..f376154d39 100644
Binary files a/modules/web/css/VAADIN/themes/havana/window/img/win-body-bg.png and b/modules/web/css/VAADIN/themes/havana/window/img/win-body-bg.png differ
diff --git a/modules/web/css/VAADIN/themes/havana/window/img/win-header-left.png b/modules/web/css/VAADIN/themes/havana/window/img/win-header-left.png
deleted file mode 100644
index 901eb6a273..0000000000
Binary files a/modules/web/css/VAADIN/themes/havana/window/img/win-header-left.png and /dev/null differ
diff --git a/modules/web/css/VAADIN/themes/havana/window/img/win-header-right-wide.png b/modules/web/css/VAADIN/themes/havana/window/img/win-header-right-wide.png
deleted file mode 100644
index a35a113518..0000000000
Binary files a/modules/web/css/VAADIN/themes/havana/window/img/win-header-right-wide.png and /dev/null differ
diff --git a/modules/web/css/VAADIN/themes/havana/window/window.css b/modules/web/css/VAADIN/themes/havana/window/window.css
index 313d65c992..9830cf9fe1 100644
--- a/modules/web/css/VAADIN/themes/havana/window/window.css
+++ b/modules/web/css/VAADIN/themes/havana/window/window.css
@@ -12,7 +12,7 @@
 .v-window-outerheader {
 	margin-left: 0;
 	padding: 0 0 0 5px;
-    background: url(img/win-header-left.png) no-repeat left top;
+    background: #2b4666 no-repeat left top;
     cursor: move;
 /*
     border: 0 solid #131415;
@@ -25,7 +25,7 @@
     padding: 6px 5px 5px 7px;
 	font-weight: bold;
 	letter-spacing: 0;
-    background: url(img/win-header-right-wide.png) no-repeat right top;
+    background: #2b4666 no-repeat right top;
 	color: #ffffff;
 	white-space: nowrap;
 	text-overflow: ellipsis;
@@ -42,7 +42,7 @@
 }
 
 .v-window-contents {
-	background: #fff;
+	background: url(img/win-body-bg.png) repeat-x left top #fff;
 	color: #1E3146;
     padding: 8px;
     font-size: 12px;
diff --git a/modules/web/css/VAADIN/themes/peyto/groupbox/groupbox.css b/modules/web/css/VAADIN/themes/peyto/groupbox/groupbox.css
index 976bb60a1f..10fdc16c3b 100644
--- a/modules/web/css/VAADIN/themes/peyto/groupbox/groupbox.css
+++ b/modules/web/css/VAADIN/themes/peyto/groupbox/groupbox.css
@@ -9,7 +9,7 @@
 
 .group-box {
     background: #fff;
-    padding-top: .5em; /*������������ ����� legend, ��� ����� ��� ��� �� ������� ������������� overflow: hidden*/
+    /*padding-top: .5em;*/
 }
 
 .group-box.group-box-nocollapsable.group-box-nocaption {