Bug 1020862 - Calculator Visual Refresh follow-up

WIP