Improved image icons, added limit to image previews