Various updates, including the addition of icons