Added icon and nonatomic