Added icon and removed badges