Added snippets and icons.
Merging from master
Resolved conflicts