bug 39211 and bug 40310 Minimize and close icons.

* Larger minimize icon
* close and minimize don't appear together.

Change-Id: I14ab671fd1304e572389722a0087293d996e0dfe
Merge "bug 39211 and bug 40310 Minimize and close icons."