Am I right to say that your patch consist of replacing  EV_PIXMAP by EV_PIXMAP_BUFFER?

If yes, this seems good for commit 

Is `class_icon_map' still used?
if not, we could remove it