Code Cleanup and icon change