Fixed calendar functionality
Fixed icons issue