am 6ba84dcd: Merge "Refactor action label/icon definitions" into lmp-dev

* commit '6ba84dcd96418a7a568afeaf064aa64cf94a1839':
  Refactor action label/icon definitions