added genericon support