am 1b5bd6b6: Merge "Update QS settings icon, remove unused location icon." into klp-dev

* commit '1b5bd6b68af0f26dc0f42e442a9ffa8e1f30e3e5':
  Update QS settings icon, remove unused location icon.