XBM icon support

Joint work with Edward O'Callaghan.