Changed to code from work mac, this includes all icons