Applied bug fix from trunk r1626419. Applied bug fix from jira issue - OFBIZ-5773 - <@htmlTemplate.renderDateTimeField> icon buttons disappear on some pages after refresh. Thanks Akash Jain for the contribution.