#200 - updating the tooltip and icon