[FEATURE] Make use of the thumbnail service

The patch also remove some deprecated code