Cleaning up and change icons