Add icons for ChoiceList - some teams use PLi code
Update Makefile.am for new icons
Adapted for changed button setup
Merge remote-tracking branch 'skin/master'

* skin/master:
  Adapted for changed button setup
  Update Makefile.am for new icons
  Add icons for ChoiceList - some teams use PLi code