Category bug didn't add default category.
Added new icons.
Changed to using thumbnails.
Merge branch 'thomas'
Merge