Fix calculator bug
images / icons changes