Switched back to the @Connector model + updated icons for transformers