Added ability to choose custom icon type