Added icons and fixed badge count when 0