[Icons] Break up icon processing