Messy still, but icon border works :)