Added icon menu support