Merge "Update QS settings icon, remove unused location icon." into klp-dev