Added calendar expander.
Improved the non-expanded calendar case.
More flexible handling of icons.