LBSD-220: Changes to the close button