2 files changed, 11 insertions, 5 deletions
diff --git a/WebContent/VAADIN/themes/base/window/window.css b/WebContent/VAADIN/themes/base/window/window.css
index 986cfeaeb8..701140333a 100644
--- a/WebContent/VAADIN/themes/base/window/window.css
+++ b/WebContent/VAADIN/themes/base/window/window.css
@@ -2,15 +2,20 @@
 	background: #fff;
 }
 .v-window-outerheader {
-	padding: 0.3em 1em;
+	padding: 0.3em 0;
 	height: 1em;
+	position: relative;
 }
 
 .v-window-outerheader,
 .v-window-draggingCurtain {
  	cursor: move;	
 }
-
+.v-window-header.v-not-spanning {
+	position: absolute;
+	left: 0;
+	right: 0;
+}
 .v-window-header {
 	font-weight: bold;
 }
@@ -20,7 +25,7 @@ div.v-window-header {
 	text-overflow: ellipsis;
 	-ms-text-overflow: ellipsis;
 	overflow: hidden;
-	padding: 0;
+	padding: 0 1em;
 }
 .v-window-header .v-icon {
 	vertical-align: middle; /* This has to be 'middle', not 'bottom', to allow larger icons than 16px */
diff --git a/WebContent/VAADIN/themes/reindeer/window/window.css b/WebContent/VAADIN/themes/reindeer/window/window.css
index 25829b2f2b..e24b00e4ea 100644
--- a/WebContent/VAADIN/themes/reindeer/window/window.css
+++ b/WebContent/VAADIN/themes/reindeer/window/window.css
@@ -9,12 +9,12 @@
 	border-color: rgba(0,0,0,.2);
 }
 .v-window-outerheader {
-	padding: 12px 32px 0 14px;
+	padding: 12px 0 0;
 	height: 25px;
 	background: black repeat-x;
 	background-image: url(img/header-bg.png); /** sprite-ref: verticals; sprite-alignment: repeat */
 }
-.v-window-header {
+div.v-window-header {
 	font-weight: bold;
 	font-size: 12px;
 	line-height: normal;
@@ -24,6 +24,7 @@
 	overflow: hidden;
 	text-overflow: ellipsis;
 	-ms-text-overflow: ellipsis;
+	padding: 0 32px 0 14px
 }
 .v-window-error .v-window-header {
 	padding-left: 13px;