Optional calendar icons

Added handling for optional calendar icons