moved icons to viewer
Merge remote-tracking branch 'origin/dev' into dev