The favorite link is a button when logged in; style it consistently
Add back the <span> around the favorites count

Tests and, more importantly, JS which updates the count relies on the
<span>.  Keeping it necessitates adjusting CSS to preserve font-weight.