fixing icon preview
general bug fixes