Added icons and missing constructors.