Added icons
merged