Improve indicator borders