Fixed the counts and icons, I think