Merge "Refactor action label/icon definitions" into lmp-dev