am 835c4da6: am 30a2c4ab: Merge "Fix the incorrect "Add group" icon" into klp-dev

* commit '835c4da67e696dadda65143d7125de083c4e3046':
  Fix the incorrect "Add group" icon