icon cleanup, partials, random stuff