Connect more icons, remove references to old ones