Fixing clicking icon issue