Removed unused icon, added Apache Commons Lang