UPDATED: incorporated new icon set, some clean ups