Add icon to context menu
Fix some padding