finalized the icon... calendar coming soon
fixing calender
Fixed some merge issues with Calendar