Fix issue with second screen, changed icons