more work on icon classes