icons fixed
merged conflicts