Feature Request: Add an icon to the button to open the calendar

Implemented Feature and some minor code cleanups