Updated Core to fix attachment icon issue
Merged with pull requests