added icons
merged with master