Merge "Make icon visible on context menu"