Improve toggle icon positioning