Tweaks

Some inset stuff and switching icons to use `<span>`.