Fixed buttons (16/18)

Fixed buttons