BZ-9469 - changes to buttons