Merge change 8839

* changes:
  Fix selection and change icon loading from 565 to 8888.