renamed folder back to icons, moved images being used out of subs