MINIMIZE, MAXIMIZE, CLOSE NOT SYNC WITH THEME

Fixed issue with MINIMIZE, MAXIMIZE, CLOSE when changing theme during
run time