Added IconKeeper class