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

* commit '161e43dc5952a607a5996ab2cd07ac3ef49c2902':
  Update QS settings icon, remove unused location icon.