1 files changed, 24 insertions, 10 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;