CMS-3402 Use icon class instead of urls for ComboBoxes