updated icon and cleaned up EntityFactory