Removed camelcase icon name indirection