Address margins on .navbar-right to fix #13325 #13464.

This commit follows f9fde56.