Added Category and Icon to Custom Controls as part of #137