Update Icon and minor code clean-up