CON-1016 | Fix with of button