Added default Icon support and fixed maximized thumbs