icon issue resolved
refactorings