New version with runtime advanced checking
icons update