Ticket #1080: beautified row_buttons