Removed the need for the "tabbed" option, and added an "icon" option to tab type.