Adjusted types and icon names, icons in local, not committed files