Adjusted tray icon menu
Fixed conflicts with language