Update icon tags to use new style - refs BT#7203