Merge "change icons for window magnification" into sc-dev