Andrew's clean up and icon change