Calendar fixes + extra assets for suggestions

See #2245