Merge "Fixed an issue where icons could remain white" into pi-dev