Correct icon badge number + minor fixes