Fixed icon issue & colour picker init issue