Fixed double icon issue and added new icons.