Refactorings. Added a shortcut and an icon for the context menu entry.