int changed to NSInteger
Events and IconEvents set using new API
Fixed warning related to integer cast
Revert "Fixed warning related to integer cast"

This reverts commit 7ff9d748e3b7a35ad9efc5882ad30253f8af39db.
Fixed issue with integer cast
Class adjustments