added wine icons
simplified factory