Added counters and revised icons