Switching to the font instead of the pngs for icons
Fixing links and badge styles