CON-1815 | Extract icon-size and fix proper offset