few tidyups from icon merge