SOS-2014 Fix toolbar icon issue