Updated icons and naming convention