BS-8678, fix style of the popup and the button