CMS-3325 Use icon class instead of urls for for ComboBoxes