Structure: use icon-name instead of stock-id
Use image-x-generic icon-name instead of stock-id

So no need to register some icon-names as stock-ids.