1- updated icons
2- removed counts code