#29 Improve main frame icon support