Use triangle for non-icon mode

Also changes icon mode back to using a dash instead of a border, but positions
it in between lines. This looks the same but seemed less of a hack.

Test plan:
Switched between both versions in a 90 line file and they look good.