Tidying up the Icons