Re-organise icons to remove smart image directory