updated view and added get_icon_name
Merge remote-tracking branch 'origin/master'