[#1251] add icon support and better default icons