fixed core data, added icons