clean-up
add support of icons in context menu