am 1a266f16: Highlight selected option in FX and Borders

* commit '1a266f16edbef7cb0a770d37fcad958fc55a5862':
  Highlight selected option in FX and Borders