Updated to standard icons
Added icon/thumb code