WIP - Bug 988498 - [meta] Calculator Visual Refresh

Work in progress - Do not merge
<br/>
Few more issues need to be addressed.