LPS-34148 Fixing button selectors