Improved aspect button behavior (issue #2280)