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

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