9 files changed, 64 insertions, 24 deletions

diff --git a/WebContent/VAADIN/themes/chameleon/components/window/window.scss b/WebContent/VAADIN/themes/chameleon/components/window/window.scss
index e9524745f8..92ada43c90 100644
--- a/WebContent/VAADIN/themes/chameleon/components/window/window.scss
+++ b/WebContent/VAADIN/themes/chameleon/components/window/window.scss
@@ -1,25 +1,39 @@
 @mixin chameleon-window($primaryStyleName : v-window) {
 
-.#{$primaryStyleName}-closebox {
+.#{$primaryStyleName}-closebox,
+.#{$primaryStyleName}-restorebox,
+.#{$primaryStyleName}-maximizebox {
 	width: 14px;
 	height: 15px;
 	overflow: hidden;
-	text-indent: -50px;
-	background: transparent url(../../img/close-btn.png) no-repeat;
 	vertical-align: middle;
 	margin: 0;
 	top: .3em;
-	right: .4em;
 	z-index: 2;
+	&:hover {
+		background-position: 0 -25px;
 	}
-
-.#{$primaryStyleName}-closebox:hover {
-	background-position: 0 -25px;
+	&:active {
+		background-position: 0 -50px;
 	}
+}
+.#{$primaryStyleName}-closebox {
+	text-indent: -50px;
+	background: transparent url(../../img/close-btn.png) no-repeat;
+	right: .4em;
+}
+.#{$primaryStyleName}-restorebox,
+.#{$primaryStyleName}-maximizebox {
+	right: 1.8em;
+}
+
+.#{$primaryStyleName}-restorebox {
+	background: transparent url(../../img/restore.png) no-repeat;
+}
+.#{$primaryStyleName}-maximizebox {
+	background: transparent url(../../img/maximize.png) no-repeat;
+}
 
-.#{$primaryStyleName}-closebox:active {
-	background-position: 0 -50px;
-	}
 
 .#{$primaryStyleName} {
 	background-image: none;
diff --git a/WebContent/VAADIN/themes/chameleon/img/maximize.png b/WebContent/VAADIN/themes/chameleon/img/maximize.png
new file mode 100644
index 0000000000..5c6488d1a5
--- /dev/null
+++ b/WebContent/VAADIN/themes/chameleon/img/maximize.png
diff --git a/WebContent/VAADIN/themes/chameleon/img/restore.png b/WebContent/VAADIN/themes/chameleon/img/restore.png
new file mode 100644
index 0000000000..55d004fe53
--- /dev/null
+++ b/WebContent/VAADIN/themes/chameleon/img/restore.png
diff --git a/WebContent/VAADIN/themes/liferay/window/maximize_sprites.png b/WebContent/VAADIN/themes/liferay/window/maximize_sprites.png
new file mode 100644
index 0000000000..06510063cd
--- /dev/null
+++ b/WebContent/VAADIN/themes/liferay/window/maximize_sprites.png
diff --git a/WebContent/VAADIN/themes/liferay/window/restore_sprites.png b/WebContent/VAADIN/themes/liferay/window/restore_sprites.png
new file mode 100644
index 0000000000..41ccfaf79f
--- /dev/null
+++ b/WebContent/VAADIN/themes/liferay/window/restore_sprites.png
diff --git a/WebContent/VAADIN/themes/liferay/window/window.scss b/WebContent/VAADIN/themes/liferay/window/window.scss
index 54bfb37938..583a81d9e4 100644
--- a/WebContent/VAADIN/themes/liferay/window/window.scss
+++ b/WebContent/VAADIN/themes/liferay/window/window.scss
@@ -42,21 +42,35 @@
 	height: 5px;
 }
 
+.v-window-restorebox,
+.v-window-maximizebox,
 .v-window-closebox {
-	background: url(closebutton_sprites.png) no-repeat scroll 0 0 transparent;
 	position: absolute;
 	width: 24px;
 	height: 24px;
-	right: 9px;
 	top: 8px;
+	&:hover {
+		background-position: 0 -24px;	
+	}
+	&:active {
+		background-position: 0 -48px;
+	}	
+	
 }
-
-.v-window-closebox:hover {
-	background-position: 0 -24px;	
+.v-window-closebox {
+	right: 9px;
+	background: url(closebutton_sprites.png) no-repeat scroll 0 0 transparent;
 }
 
-.v-window-closebox:active {
-	background-position: 0 -48px;	
+.v-window-restorebox,
+.v-window-maximizebox {
+	right: 36px;
+}
+.v-window-restorebox {
+	background: url(restore_sprites.png) no-repeat scroll 0 0 transparent;
+}
+.v-window-maximizebox {
+	background: url(maximize_sprites.png) no-repeat scroll 0 0 transparent;
 }
 
 .v-window-resizebox {
diff --git a/WebContent/VAADIN/themes/runo/window/img/maximize.png b/WebContent/VAADIN/themes/runo/window/img/maximize.png
new file mode 100644
index 0000000000..c7a1a8d418
--- /dev/null
+++ b/WebContent/VAADIN/themes/runo/window/img/maximize.png
diff --git a/WebContent/VAADIN/themes/runo/window/img/restore.png b/WebContent/VAADIN/themes/runo/window/img/restore.png
new file mode 100644
index 0000000000..15ac00ddb2
--- /dev/null
+++ b/WebContent/VAADIN/themes/runo/window/img/restore.png
diff --git a/WebContent/VAADIN/themes/runo/window/window.scss b/WebContent/VAADIN/themes/runo/window/window.scss
index db153243e9..da597d769a 100644
--- a/WebContent/VAADIN/themes/runo/window/window.scss
+++ b/WebContent/VAADIN/themes/runo/window/window.scss
@@ -56,13 +56,17 @@
 .#{$primaryStyleName}-restorebox {
 	position: absolute;
 	top: 21px;
-	width: 12px;
 	height: 12px;
 	background: transparent url(img/close.png);
 }
 .#{$primaryStyleName}-closebox {
+	width: 12px;
+	height: 12px;
 	right: 24px;
 	background: transparent url(img/close.png);
+	&:hover {
+		background-position: 0 -12px;
+	}
 }
 
 .#{$primaryStyleName}-maximizebox,
@@ -70,17 +74,25 @@
 	right: 42px;
 }
 
-.#{$primaryStyleName}-maximizebox {
-	background: transparent url(img/maximize.png);
-}
-
 .#{$primaryStyleName}-restorebox {
+	width: 15px;
+	height: 14px;
+
 	background: transparent url(img/restore.png);
+	&:hover {
+		background-position: 0 -14px;
+	}
 }
+.#{$primaryStyleName}-maximizebox {
+	width: 13px;
+	height: 12px;
 
-.#{$primaryStyleName}-closebox:hover {
-	background-position: 0 -12px;
+	background: transparent url(img/maximize.png);
+	&:hover {
+		background-position: 0 -12px;
+	}
 }
+
 .#{$primaryStyleName}-modalitycurtain {
 	background: #fff;
 }