Merge "Update remaining settings icon with old style." into klp-dev