articles icons
merge with master
some changes