Merge "Payments: use latest settings icon." into klp-dev