Style fixes

Resolves #1293 and #1297
put the `<i>` inside the `<a>`