#20 #21
Fixed bug with icons updating.
Merge branch 'hotfix/IconsUpdate'