remove unused icon, refactor names