Icon and code cleaning