Removed Icon implementation
Added Wing