Merge "Cleaning up icon code."