Updating references and adding more icons