Added icons to view-type buttons.
Merge remote-tracking branch 'origin/master'
Fixed the build.