More work on Icon()