am 499c7eeb: Merge "Update remaining settings icon with old style." into klp-dev

* commit '499c7eeb9ad59e5449481eb871db24a176f2ccdb':
  Update remaining settings icon with old style.