Removed require_once because autoloading fails
New icons for 6.x and 7.x