diff --git a/src/VisualStudio/Core/Def/Commands.vsct b/src/VisualStudio/Core/Def/Commands.vsct
index acae0dfe7107b..a6e3826dd285a 100644
--- a/src/VisualStudio/Core/Def/Commands.vsct
+++ b/src/VisualStudio/Core/Def/Commands.vsct
@@ -68,6 +68,10 @@
       </Group>
 
       <Group guid="guidStackTraceExplorer" id="StackTraceExplorerContextMenuGrp" />
+
+      <Group guid="guidRoslynGrpId" id="cmdidDocumentOutlineToolbarGroup" priority="0x0100">
+        <Parent guid="guidRoslynGrpId" id="cmdidDocumentOutlineToolbar" />
+      </Group>
     </Groups>
 
     <Buttons>
@@ -533,6 +537,71 @@
           <LocCanonicalName>ClearStackTraceExplorer</LocCanonicalName>
         </Strings>
       </Button>
+
+      <Button guid="guidRoslynGrpId" id="cmdidDocumentOutlineExpandAll" priority="0x0101" type="Button">
+        <Parent guid="guidRoslynGrpId" id="cmdidDocumentOutlineToolbarGroup" />
+        <Icon guid="ImageCatalogGuid" id="ExpandAll" />
+        <CommandFlag>DefaultDisabled</CommandFlag>
+        <CommandFlag>IconIsMoniker</CommandFlag>
+        <Strings>
+          <LocCanonicalName>DocumentOutlineExpandAll</LocCanonicalName>
+          <ButtonText>Expand All</ButtonText>
+          <MenuText>Expand All</MenuText>
+          <ToolTipText>Expand All</ToolTipText>
+        </Strings>
+      </Button>
+
+      <Button guid="guidRoslynGrpId" id="cmdidDocumentOutlineCollapseAll" priority="0x0102" type="Button">
+        <Parent guid="guidRoslynGrpId" id="cmdidDocumentOutlineToolbarGroup" />
+        <Icon guid="ImageCatalogGuid" id="CollapseAll" />
+        <CommandFlag>DefaultDisabled</CommandFlag>
+        <CommandFlag>IconIsMoniker</CommandFlag>
+        <Strings>
+          <LocCanonicalName>DocumentOutlineCollapseAll</LocCanonicalName>
+          <ButtonText>Collapse All</ButtonText>
+          <MenuText>Collapse All</MenuText>
+          <ToolTipText>Collapse All</ToolTipText>
+        </Strings>
+      </Button>
+
+      <Button guid="guidRoslynGrpId" id="cmdidDocumentOutlineSortByName" priority="0x0103" type="Button">
+        <Parent guid="guidRoslynGrpId" id="cmdidDocumentOutlineToolbarGroup" />
+        <Icon guid="ImageCatalogGuid" id="SortAscending" />
+        <CommandFlag>DefaultDisabled</CommandFlag>
+        <CommandFlag>IconIsMoniker</CommandFlag>
+        <Strings>
+          <LocCanonicalName>DocumentOutlineSortByName</LocCanonicalName>
+          <ButtonText>Sort By Name</ButtonText>
+          <MenuText>Sort By Name</MenuText>
+          <ToolTipText>Sort By Name</ToolTipText>
+        </Strings>
+      </Button>
+
+      <Button guid="guidRoslynGrpId" id="cmdidDocumentOutlineSortByOrder" priority="0x0104" type="Button">
+        <Parent guid="guidRoslynGrpId" id="cmdidDocumentOutlineToolbarGroup" />
+        <Icon guid="ImageCatalogGuid" id="SortByNamespace" />
+        <CommandFlag>DefaultDisabled</CommandFlag>
+        <CommandFlag>IconIsMoniker</CommandFlag>
+        <Strings>
+          <LocCanonicalName>DocumentOutlineSortByOrder</LocCanonicalName>
+          <ButtonText>Sort By Order</ButtonText>
+          <MenuText>Sort By Order</MenuText>
+          <ToolTipText>Sort By Order</ToolTipText>
+        </Strings>
+      </Button>
+
+      <Button guid="guidRoslynGrpId" id="cmdidDocumentOutlineSortByType" priority="0x0105" type="Button">
+        <Parent guid="guidRoslynGrpId" id="cmdidDocumentOutlineToolbarGroup" />
+        <Icon guid="ImageCatalogGuid" id="SortByType" />
+        <CommandFlag>DefaultDisabled</CommandFlag>
+        <CommandFlag>IconIsMoniker</CommandFlag>
+        <Strings>
+          <LocCanonicalName>DocumentOutlineSortByType</LocCanonicalName>
+          <ButtonText>Sort By Type</ButtonText>
+          <MenuText>Sort By Type</MenuText>
+          <ToolTipText>Sort By Type</ToolTipText>
+        </Strings>
+      </Button>
     </Buttons>
 
     <Menus>
@@ -618,6 +687,15 @@
           <ButtonText>StackTrace Explorer</ButtonText>
         </Strings>
       </Menu>
+
+      <!-- Document Outline toolbar -->
+      <Menu guid="guidRoslynGrpId" id="cmdidDocumentOutlineToolbar" type="Toolbar">
+        <CommandFlag>NotInTBList</CommandFlag>
+        <Strings>
+          <LocCanonicalName>RoslynDocumentOutlineToolbar</LocCanonicalName>
+          <ButtonText>Document Outline</ButtonText>
+        </Strings>
+      </Menu>
     </Menus>
   </Commands>
 
@@ -780,6 +858,14 @@
       <IDSymbol name="cmdidshowValueTracking"  value="0x0203" />
 
       <IDSymbol name="cmdidSyncNamespaces" value="0x204" />
+
+      <IDSymbol name="cmdidDocumentOutlineToolbar" value="0x300" />
+      <IDSymbol name="cmdidDocumentOutlineExpandAll" value="0x311"/>
+      <IDSymbol name="cmdidDocumentOutlineCollapseAll" value="0x312"/>
+      <IDSymbol name="cmdidDocumentOutlineSortByName" value="0x313"/>
+      <IDSymbol name="cmdidDocumentOutlineSortByOrder" value="0x314"/>
+      <IDSymbol name="cmdidDocumentOutlineSortByType" value="0x315"/>
+      <IDSymbol name="cmdidDocumentOutlineToolbarGroup" value="0x350" />
     </GuidSymbol>
 
     <GuidSymbol name="guidEditorCommands" value="{160961B3-909D-4B28-9353-A1BEF587B4A6}">
diff --git a/src/VisualStudio/Core/Def/DocumentOutline/DocumentOutlineOptionsStorage.cs b/src/VisualStudio/Core/Def/DocumentOutline/DocumentOutlineOptionsStorage.cs
index 4f20a737432db..7d41c9ec82b30 100644
--- a/src/VisualStudio/Core/Def/DocumentOutline/DocumentOutlineOptionsStorage.cs
+++ b/src/VisualStudio/Core/Def/DocumentOutline/DocumentOutlineOptionsStorage.cs
@@ -12,5 +12,7 @@ namespace Microsoft.VisualStudio.LanguageServices.DocumentOutline
     internal sealed class DocumentOutlineOptionsStorage
     {
         public static readonly Option2<bool> EnableDocumentOutline = new("visual_studio_enable_document_outline", defaultValue: false);
+
+        public static readonly Option2<SortOption> DocumentOutlineSortOrder = new("visual_studio_document_outline_sort_order", defaultValue: SortOption.Location);
     }
 }
diff --git a/src/VisualStudio/Core/Def/DocumentOutline/DocumentOutlineStrings.cs b/src/VisualStudio/Core/Def/DocumentOutline/DocumentOutlineStrings.cs
index 1d063a14ab79a..b9402a4af0609 100644
--- a/src/VisualStudio/Core/Def/DocumentOutline/DocumentOutlineStrings.cs
+++ b/src/VisualStudio/Core/Def/DocumentOutline/DocumentOutlineStrings.cs
@@ -6,22 +6,7 @@ namespace Microsoft.VisualStudio.LanguageServices.DocumentOutline
 {
     internal static class DocumentOutlineStrings
     {
-        public static string Document_Outline_Search
-            => ServicesVSResources.Document_Outline_Search;
-
-        public static string Document_Outline_Expand_All
-            => ServicesVSResources.Document_Outline_Expand_All;
-
-        public static string Document_Outline_Collapse_All
-            => ServicesVSResources.Document_Outline_Collapse_All;
-
-        public static string Document_Outline_Sort_Name
-            => ServicesVSResources.Document_Outline_Sort_Name;
-
-        public static string Document_Outline_Sort_Order
-            => ServicesVSResources.Document_Outline_Sort_Order;
-
-        public static string Document_Outline_Sort_Type
-            => ServicesVSResources.Document_Outline_Sort_Type;
+        public static string Document_Outline
+            => ServicesVSResources.Document_Outline;
     }
 }
diff --git a/src/VisualStudio/Core/Def/DocumentOutline/DocumentOutlineView.xaml b/src/VisualStudio/Core/Def/DocumentOutline/DocumentOutlineView.xaml
index b287ded7f6353..30c0e9a4a4b53 100644
--- a/src/VisualStudio/Core/Def/DocumentOutline/DocumentOutlineView.xaml
+++ b/src/VisualStudio/Core/Def/DocumentOutline/DocumentOutlineView.xaml
@@ -72,61 +72,12 @@
     </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
-            <RowDefinition Height="30" />
-            <RowDefinition Height="23" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
             <RowDefinition Height="*" />
         </Grid.RowDefinitions>
-        <Grid Grid.Row="0">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="28" />
-                <ColumnDefinition Width="28" />
-                <ColumnDefinition Width="28" />
-                <ColumnDefinition Width="28" />
-                <ColumnDefinition Width="28" />
-            </Grid.ColumnDefinitions>
-            <Button Grid.Column="0" Click="ExpandAll" ToolTip="{x:Static self:DocumentOutlineStrings.Document_Outline_Expand_All}">
-                <imaging:CrispImage Moniker="{x:Static imagecatalog:KnownMonikers.ExpandAll}" />
-            </Button>
-            <Button Grid.Column="1" Click="CollapseAll" ToolTip="{x:Static self:DocumentOutlineStrings.Document_Outline_Collapse_All}">
-                <imaging:CrispImage Moniker="{x:Static imagecatalog:KnownMonikers.CollapseAll}" />
-            </Button>
-            <Button Grid.Column="2" Click="SortByName" ToolTip="{x:Static self:DocumentOutlineStrings.Document_Outline_Sort_Name}">
-                <imaging:CrispImage Moniker="{x:Static imagecatalog:KnownMonikers.SortAscending}" />
-            </Button>
-            <Button Grid.Column="3" Click="SortByOrder" ToolTip="{x:Static self:DocumentOutlineStrings.Document_Outline_Sort_Order}">
-                <imaging:CrispImage Moniker="{x:Static imagecatalog:KnownMonikers.SortByNamespace}" />
-            </Button>
-            <Button Grid.Column="4" Click="SortByType" ToolTip="{x:Static self:DocumentOutlineStrings.Document_Outline_Sort_Type}">
-                <imaging:CrispImage Moniker="{x:Static imagecatalog:KnownMonikers.SortByType}" />
-            </Button>
-        </Grid>
-        <TextBox Grid.Row="1" x:Name="SearchBox" TextChanged="SearchBox_TextChanged"  VerticalContentAlignment="Center">
-            <TextBox.Style>
-                <Style TargetType="TextBox">
-                    <Setter Property="Background" Value="{StaticResource {x:Static vsshell:VsBrushes.ToolWindowBackgroundKey}}" />
-                    <Setter Property="Foreground" Value="{DynamicResource {x:Static vsshell:VsBrushes.ToolWindowTextKey}}" />
-                    <Setter Property="Padding" Value="3, 0, 0, 0" />
-                    <Setter Property="FontFamily" Value="{StaticResource {x:Static vsshell:VsFonts.CaptionFontFamilyKey}}" />
-                    <Setter Property="FontSize" Value="{StaticResource {x:Static vsshell:VsFonts.CaptionFontSizeKey}}" />
-                    <Setter Property="CaretBrush" Value="{StaticResource {x:Static vsui:HeaderColors.DefaultTextBrushKey}}" />
-                    <Style.Resources>
-                        <VisualBrush x:Key="CueBannerBrush" AlignmentX="Left" AlignmentY="Center" Stretch="None">
-                            <VisualBrush.Visual>
-                                <Label Content="{x:Static self:DocumentOutlineStrings.Document_Outline_Search}"
-                                       Foreground="{DynamicResource {x:Static vsshell:VsBrushes.TitleBarInactiveTextKey}}"
-                                       FontFamily="{StaticResource {x:Static vsshell:VsFonts.CaptionFontFamilyKey}}"
-                                       FontSize="{StaticResource {x:Static vsshell:VsFonts.CaptionFontSizeKey}}" />
-                            </VisualBrush.Visual>
-                        </VisualBrush>
-                    </Style.Resources>
-                    <Style.Triggers>
-                        <Trigger Property="Text" Value="">
-                            <Setter Property="Background" Value="{StaticResource CueBannerBrush}" />
-                        </Trigger>
-                    </Style.Triggers>
-                </Style>
-            </TextBox.Style>
-        </TextBox>
+        <ContentControl Grid.Row="0" Name="Commands" Focusable="True" />
+        <Grid Grid.Row="1" x:Name="SearchHost" />
         <!-- Two important properties are being set for TreeView:
                We set IsVirtualizing to "True" so that WPF only generates internal data-structures elements that are visible.
                Setting VirtualizationMode to "Recycling" ensures that WPF internal data is reused as items scroll in and out of view.
@@ -140,16 +91,18 @@
              interaction. -->
         <TreeView Grid.Row="2"
                   Name="SymbolTree"
+                  AutomationProperties.Name="{x:Static self:DocumentOutlineStrings.Document_Outline}"
                   VirtualizingStackPanel.IsVirtualizing="True"
                   VirtualizingStackPanel.VirtualizationMode="Recycling"
                   TreeViewItem.SourceUpdated="SymbolTreeItem_SourceUpdated"
+                  TreeViewItem.Selected="SymbolTreeItem_Selected"
                   ItemsSource="{Binding Source={StaticResource DocumentSymbolItems}}"> <!-- Binding to our CollectionViewSource -->
             <TreeView.Resources>
                 <HierarchicalDataTemplate DataType="{x:Type self:DocumentSymbolDataViewModel}">
                     <HierarchicalDataTemplate.ItemsSource>
                         <MultiBinding Converter="{StaticResource ItemSorter}"> <!-- This binding ensures our TreeViewItems are sorted if the collection is changed OR the sort option is changed -->
                             <Binding Path="Children" />
-                            <Binding Path="DataContext.SortOption"  RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=UserControl}" />
+                            <Binding Path="DataContext.SortOption" RelativeSource="{RelativeSource Mode=FindAncestor, AncestorType=UserControl}" />
                         </MultiBinding>
                     </HierarchicalDataTemplate.ItemsSource>
                     <StackPanel Orientation="Horizontal"
@@ -170,6 +123,7 @@
             <TreeView.ItemContainerStyle>
                 <Style TargetType="TreeViewItem" BasedOn="{StaticResource {x:Static vsshell:VsResourceKeys.ThemedDialogTreeViewItemStyleKey}}">
                     <Setter Property="IsExpanded" Value="{Binding IsExpanded, Mode=TwoWay}" />
+                    <Setter Property="AutomationProperties.Name" Value="{Binding Data.Name, Mode=OneWay}" />
                     <!-- See docs above for why we set `NotifyOnSourceUpdated=True, NotifyOnTargetUpdated=False` -->
                     <Setter Property="IsSelected" Value="{Binding IsSelected, Mode=TwoWay, NotifyOnSourceUpdated=True, NotifyOnTargetUpdated=False}" />
                     <Setter Property="Padding" Value="4, 0, 6, 1" />
diff --git a/src/VisualStudio/Core/Def/DocumentOutline/DocumentOutlineView.xaml.cs b/src/VisualStudio/Core/Def/DocumentOutline/DocumentOutlineView.xaml.cs
index 26102f4b0b043..6ced0df70e918 100644
--- a/src/VisualStudio/Core/Def/DocumentOutline/DocumentOutlineView.xaml.cs
+++ b/src/VisualStudio/Core/Def/DocumentOutline/DocumentOutlineView.xaml.cs
@@ -3,22 +3,26 @@
 // See the LICENSE file in the project root for more information.
 
 using System;
-using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.ComponentModel;
-using System.Diagnostics;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Data;
+using System.Windows.Media;
 using Microsoft.CodeAnalysis.Editor.Shared.Extensions;
 using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
 using Microsoft.CodeAnalysis.Internal.Log;
-using Microsoft.VisualStudio.Editor;
-using Microsoft.VisualStudio.LanguageServices.Implementation;
+using Microsoft.CodeAnalysis.Options;
 using Microsoft.VisualStudio.LanguageServices.Utilities;
+using Microsoft.VisualStudio.PlatformUI;
+using Microsoft.VisualStudio.Shell;
+using Microsoft.VisualStudio.Shell.Interop;
 using Microsoft.VisualStudio.Text;
-using Microsoft.VisualStudio.Text.Editor;
-using Microsoft.VisualStudio.TextManager.Interop;
+using InternalUtilities = Microsoft.Internal.VisualStudio.PlatformUI.Utilities;
+using IOleCommandTarget = Microsoft.VisualStudio.OLE.Interop.IOleCommandTarget;
+using OLECMD = Microsoft.VisualStudio.OLE.Interop.OLECMD;
+using OLECMDF = Microsoft.VisualStudio.OLE.Interop.OLECMDF;
+using OleConstants = Microsoft.VisualStudio.OLE.Interop.Constants;
 
 namespace Microsoft.VisualStudio.LanguageServices.DocumentOutline
 {
@@ -26,64 +30,190 @@ namespace Microsoft.VisualStudio.LanguageServices.DocumentOutline
     /// Interaction logic for DocumentOutlineView.xaml
     /// All operations happen on the UI thread for visual studio
     /// </summary>
-    internal sealed partial class DocumentOutlineView : UserControl, IDisposable
+    internal sealed partial class DocumentOutlineView : UserControl, IOleCommandTarget, IDisposable, IVsWindowSearch
     {
         private readonly IThreadingContext _threadingContext;
+        private readonly IGlobalOptionService _globalOptionService;
         private readonly VsCodeWindowViewTracker _viewTracker;
         private readonly DocumentOutlineViewModel _viewModel;
+        private readonly IVsToolbarTrayHost _toolbarTrayHost;
+        private readonly IVsWindowSearchHost _windowSearchHost;
 
         public DocumentOutlineView(
+            IVsUIShell4 uiShell,
+            IVsWindowSearchHostFactory windowSearchHostFactory,
             IThreadingContext threadingContext,
+            IGlobalOptionService globalOptionService,
             VsCodeWindowViewTracker viewTracker,
             DocumentOutlineViewModel viewModel)
         {
             _threadingContext = threadingContext;
+            _globalOptionService = globalOptionService;
             _viewTracker = viewTracker;
             _viewModel = viewModel;
 
             DataContext = _viewModel;
             InitializeComponent();
-            UpdateSort(SortOption.Location); // Set default sort for top-level items
+            UpdateSort(_globalOptionService.GetOption(DocumentOutlineOptionsStorage.DocumentOutlineSortOrder), userSelected: false);
+
+            ErrorHandler.ThrowOnFailure(uiShell.CreateToolbarTray(this, out _toolbarTrayHost));
+            ErrorHandler.ThrowOnFailure(_toolbarTrayHost.AddToolbar(Guids.RoslynGroupId, ID.RoslynCommands.DocumentOutlineToolbar));
+
+            ErrorHandler.ThrowOnFailure(_toolbarTrayHost.GetToolbarTray(out var toolbarTray));
+            ErrorHandler.ThrowOnFailure(toolbarTray.GetUIObject(out var uiObject));
+            ErrorHandler.ThrowOnFailure(((IVsUIWpfElement)uiObject).GetFrameworkElement(out var frameworkElement));
+            Commands.Content = frameworkElement;
+
+            _windowSearchHost = windowSearchHostFactory.CreateWindowSearchHost(SearchHost);
+            _windowSearchHost.SetupSearch(this);
 
             viewTracker.CaretMovedOrActiveViewChanged += ViewTracker_CaretMovedOrActiveViewChanged;
         }
 
         public void Dispose()
         {
+            _toolbarTrayHost.Close();
+            _windowSearchHost.TerminateSearch();
             _viewTracker.CaretMovedOrActiveViewChanged -= ViewTracker_CaretMovedOrActiveViewChanged;
             _viewModel.Dispose();
         }
 
-        private void SearchBox_TextChanged(object sender, TextChangedEventArgs e)
-            => _viewModel.SearchText = SearchBox.Text;
+        int IOleCommandTarget.QueryStatus(ref Guid pguidCmdGroup, uint cCmds, OLECMD[] prgCmds, IntPtr pCmdText)
+        {
+            if (pguidCmdGroup == Guids.RoslynGroupId)
+            {
+                for (var i = 0; i < cCmds; i++)
+                {
+                    switch (prgCmds[i].cmdID)
+                    {
+                        case ID.RoslynCommands.DocumentOutlineExpandAll:
+                            prgCmds[i].cmdf = (uint)(OLECMDF.OLECMDF_SUPPORTED | OLECMDF.OLECMDF_ENABLED);
+                            break;
+
+                        case ID.RoslynCommands.DocumentOutlineCollapseAll:
+                            prgCmds[i].cmdf = (uint)(OLECMDF.OLECMDF_SUPPORTED | OLECMDF.OLECMDF_ENABLED);
+                            break;
+
+                        case ID.RoslynCommands.DocumentOutlineSortByName:
+                            prgCmds[i].cmdf = (uint)(OLECMDF.OLECMDF_SUPPORTED | OLECMDF.OLECMDF_ENABLED);
+                            if (_viewModel.SortOption == SortOption.Name)
+                                prgCmds[i].cmdf |= (uint)OLECMDF.OLECMDF_LATCHED;
 
-        private void ExpandAll(object sender, RoutedEventArgs e)
-            => _viewModel.ExpandOrCollapseAll(true);
+                            break;
 
-        private void CollapseAll(object sender, RoutedEventArgs e)
-            => _viewModel.ExpandOrCollapseAll(false);
+                        case ID.RoslynCommands.DocumentOutlineSortByOrder:
+                            prgCmds[i].cmdf = (uint)(OLECMDF.OLECMDF_SUPPORTED | OLECMDF.OLECMDF_ENABLED);
+                            if (_viewModel.SortOption == SortOption.Location)
+                                prgCmds[i].cmdf |= (uint)OLECMDF.OLECMDF_LATCHED;
 
-        private void SortByName(object sender, EventArgs e)
-            => UpdateSort(SortOption.Name);
+                            break;
 
-        private void SortByOrder(object sender, EventArgs e)
-            => UpdateSort(SortOption.Location);
+                        case ID.RoslynCommands.DocumentOutlineSortByType:
+                            prgCmds[i].cmdf = (uint)(OLECMDF.OLECMDF_SUPPORTED | OLECMDF.OLECMDF_ENABLED);
+                            if (_viewModel.SortOption == SortOption.Type)
+                                prgCmds[i].cmdf |= (uint)OLECMDF.OLECMDF_LATCHED;
 
-        private void SortByType(object sender, EventArgs e)
-            => UpdateSort(SortOption.Type);
+                            break;
 
-        private void UpdateSort(SortOption sortOption)
+                        default:
+                            prgCmds[i].cmdf = 0;
+                            break;
+                    }
+                }
+
+                return VSConstants.S_OK;
+            }
+
+            return (int)OleConstants.OLECMDERR_E_NOTSUPPORTED;
+        }
+
+        int IOleCommandTarget.Exec(ref Guid pguidCmdGroup, uint nCmdID, uint nCmdexecopt, IntPtr pvaIn, IntPtr pvaOut)
+        {
+            if (pguidCmdGroup == Guids.RoslynGroupId)
+            {
+                switch (nCmdID)
+                {
+                    case ID.RoslynCommands.DocumentOutlineExpandAll:
+                        _viewModel.ExpandOrCollapseAll(true);
+                        return VSConstants.S_OK;
+
+                    case ID.RoslynCommands.DocumentOutlineCollapseAll:
+                        _viewModel.ExpandOrCollapseAll(false);
+                        return VSConstants.S_OK;
+
+                    case ID.RoslynCommands.DocumentOutlineSortByName:
+                        UpdateSort(SortOption.Name, userSelected: true);
+                        return VSConstants.S_OK;
+
+                    case ID.RoslynCommands.DocumentOutlineSortByOrder:
+                        UpdateSort(SortOption.Location, userSelected: true);
+                        return VSConstants.S_OK;
+
+                    case ID.RoslynCommands.DocumentOutlineSortByType:
+                        UpdateSort(SortOption.Type, userSelected: true);
+                        return VSConstants.S_OK;
+                }
+            }
+
+            return (int)OleConstants.OLECMDERR_E_NOTSUPPORTED;
+        }
+
+        bool IVsWindowSearch.SearchEnabled => true;
+
+        Guid IVsWindowSearch.Category => Guids.DocumentOutlineSearchCategoryId;
+
+        IVsEnumWindowSearchFilters? IVsWindowSearch.SearchFiltersEnum => null;
+
+        IVsEnumWindowSearchOptions? IVsWindowSearch.SearchOptionsEnum => null;
+
+        IVsSearchTask IVsWindowSearch.CreateSearch(uint dwCookie, IVsSearchQuery pSearchQuery, IVsSearchCallback pSearchCallback)
+        {
+            _viewModel.SearchText = pSearchQuery.SearchString;
+            return new VsSearchTask(dwCookie, pSearchQuery, pSearchCallback);
+        }
+
+        void IVsWindowSearch.ClearSearch()
+        {
+            _viewModel.SearchText = "";
+        }
+
+        void IVsWindowSearch.ProvideSearchSettings(IVsUIDataSource pSearchSettings)
+        {
+            InternalUtilities.SetValue(pSearchSettings, SearchSettingsDataSource.PropertyNames.ControlMaxWidth, uint.MaxValue);
+            InternalUtilities.SetValue(pSearchSettings, SearchSettingsDataSource.PropertyNames.SearchStartType, (uint)VSSEARCHSTARTTYPE.SST_DELAYED);
+            InternalUtilities.SetValue(pSearchSettings, SearchSettingsDataSource.PropertyNames.SearchStartDelay, (uint)100);
+            InternalUtilities.SetValue(pSearchSettings, SearchSettingsDataSource.PropertyNames.SearchUseMRU, true);
+            InternalUtilities.SetValue(pSearchSettings, SearchSettingsDataSource.PropertyNames.PrefixFilterMRUItems, false);
+            InternalUtilities.SetValue(pSearchSettings, SearchSettingsDataSource.PropertyNames.MaximumMRUItems, (uint)25);
+            InternalUtilities.SetValue(pSearchSettings, SearchSettingsDataSource.PropertyNames.SearchWatermark, ServicesVSResources.Document_Outline_Search);
+            InternalUtilities.SetValue(pSearchSettings, SearchSettingsDataSource.PropertyNames.SearchPopupAutoDropdown, false);
+            InternalUtilities.SetValue(pSearchSettings, SearchSettingsDataSource.PropertyNames.ControlBorderThickness, "1");
+            InternalUtilities.SetValue(pSearchSettings, SearchSettingsDataSource.PropertyNames.SearchProgressType, (uint)VSSEARCHPROGRESSTYPE.SPT_INDETERMINATE);
+        }
+
+        bool IVsWindowSearch.OnNavigationKeyDown(uint dwNavigationKey, uint dwModifiers)
+        {
+            // By default we are not interesting in intercepting navigation keys, so return "not handled"
+            return false;
+        }
+
+        private void UpdateSort(SortOption sortOption, bool userSelected)
         {
             _threadingContext.ThrowIfNotOnUIThread();
 
-            // Log which sort option was used
-            Logger.Log(sortOption switch
+            if (userSelected)
             {
-                SortOption.Name => FunctionId.DocumentOutline_SortByName,
-                SortOption.Location => FunctionId.DocumentOutline_SortByOrder,
-                SortOption.Type => FunctionId.DocumentOutline_SortByType,
-                _ => throw new NotImplementedException(),
-            }, logLevel: LogLevel.Information);
+                // Log which sort option was used and save it back to the global options
+                Logger.Log(sortOption switch
+                {
+                    SortOption.Name => FunctionId.DocumentOutline_SortByName,
+                    SortOption.Location => FunctionId.DocumentOutline_SortByOrder,
+                    SortOption.Type => FunctionId.DocumentOutline_SortByType,
+                    _ => throw new NotImplementedException(),
+                }, logLevel: LogLevel.Information);
+
+                _globalOptionService.SetGlobalOption(DocumentOutlineOptionsStorage.DocumentOutlineSortOrder, sortOption);
+            }
 
             // "DocumentSymbolItems" is the key name we specified for our CollectionViewSource in the XAML file
             var collectionView = ((CollectionViewSource)FindResource("DocumentSymbolItems")).View;
@@ -161,6 +291,40 @@ private void SymbolTreeItem_SourceUpdated(object sender, DataTransferEventArgs e
             }
         }
 
+        /// <summary>
+        /// When a symbol node in the window is selected, make sure it is visible.
+        /// </summary>
+        private void SymbolTreeItem_Selected(object sender, RoutedEventArgs e)
+        {
+            // Construct a rectangle at the left of the item to avoid horizontal scrolling when the items is longer than
+            // fits in the view. We make the rectangle 25% the width of the containing tree view to ensure at least some
+            // of the text is visible for deeply nested items.
+            if (e.OriginalSource is TreeViewItem item)
+            {
+                double renderHeight;
+                if (item.IsExpanded)
+                {
+                    // The first child is a container. Inside the container are three children:
+                    // 1. The expander
+                    // 2. The border for the header item
+                    // 3. The container for the children
+                    //
+                    // For expanded items, we want to only consider the render heigh of the header item, since that is
+                    // the specific item which is selected.
+                    var container = VisualTreeHelper.GetChild(item, 0);
+                    var border = VisualTreeHelper.GetChild(container, 1);
+                    renderHeight = ((UIElement)border).RenderSize.Height;
+                }
+                else
+                {
+                    renderHeight = item.RenderSize.Height;
+                }
+
+                var croppedRenderWidth = Math.Min(item.RenderSize.Width, SymbolTree.RenderSize.Width / 4);
+                item.BringIntoView(new Rect(new Point(0, 0), new Size(croppedRenderWidth, renderHeight)));
+            }
+        }
+
         /// <summary>
         /// On caret position change, highlight the corresponding symbol node in the window and update the view.
         /// </summary>
diff --git a/src/VisualStudio/Core/Def/Guids.cs b/src/VisualStudio/Core/Def/Guids.cs
index 481ed4f1f975d..639c5c83dee09 100644
--- a/src/VisualStudio/Core/Def/Guids.cs
+++ b/src/VisualStudio/Core/Def/Guids.cs
@@ -127,6 +127,9 @@ internal static class Guids
         public const string StackTraceExplorerCommandIdString = "FB190424-4DFF-43DB-8CCA-E32D1CE8A5CA";
         public static readonly Guid StackTraceExplorerCommandId = new(StackTraceExplorerCommandIdString);
 
+        public const string DocumentOutlineSearchCategoryIdString = "C80E47CF-B95A-46D4-8BE4-6ADA02888333";
+        public static readonly Guid DocumentOutlineSearchCategoryId = new(DocumentOutlineSearchCategoryIdString);
+
         // TODO: Remove pending https://github.com/dotnet/roslyn/issues/8927 .
         // Interactive guids
         public const string InteractiveCommandSetIdString = "00B8868B-F9F5-4970-A048-410B05508506";
diff --git a/src/VisualStudio/Core/Def/ID.RoslynCommands.cs b/src/VisualStudio/Core/Def/ID.RoslynCommands.cs
index 52b2b88037c21..5b7a1e007a15a 100644
--- a/src/VisualStudio/Core/Def/ID.RoslynCommands.cs
+++ b/src/VisualStudio/Core/Def/ID.RoslynCommands.cs
@@ -57,6 +57,15 @@ public static class RoslynCommands
             public const int RemoveUnusedReferences = 0x0202;
             public const int GoToValueTrackingWindow = 0x0203;
             public const int SyncNamespaces = 0x0204;
+
+            // Document Outline
+            public const int DocumentOutlineToolbar = 0x300;
+            public const int DocumentOutlineExpandAll = 0x311;
+            public const int DocumentOutlineCollapseAll = 0x312;
+            public const int DocumentOutlineSortByName = 0x313;
+            public const int DocumentOutlineSortByOrder = 0x314;
+            public const int DocumentOutlineSortByType = 0x315;
+            public const int DocumentOutlineToolbarGroup = 0x350;
         }
     }
 }
diff --git a/src/VisualStudio/Core/Def/LanguageService/AbstractLanguageService`2.VsCodeWindowManager.cs b/src/VisualStudio/Core/Def/LanguageService/AbstractLanguageService`2.VsCodeWindowManager.cs
index eaba2b1c93f22..a3eb93a04a1da 100644
--- a/src/VisualStudio/Core/Def/LanguageService/AbstractLanguageService`2.VsCodeWindowManager.cs
+++ b/src/VisualStudio/Core/Def/LanguageService/AbstractLanguageService`2.VsCodeWindowManager.cs
@@ -257,6 +257,8 @@ private void GetOutline(out IntPtr phwnd)
                 var threadingContext = _languageService.Package.ComponentModel.GetService<IThreadingContext>();
                 threadingContext.ThrowIfNotOnUIThread();
 
+                var uiShell = (IVsUIShell4)_languageService.SystemServiceProvider.GetService(typeof(SVsUIShell));
+                var windowSearchHostFactory = (IVsWindowSearchHostFactory)_languageService.SystemServiceProvider.GetService(typeof(SVsWindowSearchHostFactory));
                 var languageServiceBroker = _languageService.Package.ComponentModel.GetService<ILanguageServiceBroker2>();
                 var asyncListenerProvider = _languageService.Package.ComponentModel.GetService<IAsynchronousOperationListenerProvider>();
                 var asyncListener = asyncListenerProvider.GetListener(FeatureAttribute.DocumentOutline);
@@ -268,7 +270,7 @@ private void GetOutline(out IntPtr phwnd)
 
                 var viewTracker = new VsCodeWindowViewTracker(_codeWindow, threadingContext, editorAdaptersFactoryService);
                 _documentOutlineView = new DocumentOutlineView(
-                    threadingContext, viewTracker,
+                    uiShell, windowSearchHostFactory, threadingContext, _globalOptions, viewTracker,
                     new DocumentOutlineViewModel(threadingContext, viewTracker, languageServiceBroker, asyncListener));
 
                 _documentOutlineViewHost = new ElementHost
diff --git a/src/VisualStudio/Core/Def/Options/VisualStudioOptionStorage.cs b/src/VisualStudio/Core/Def/Options/VisualStudioOptionStorage.cs
index 4ae1a89071acd..1859a6ca6927e 100644
--- a/src/VisualStudio/Core/Def/Options/VisualStudioOptionStorage.cs
+++ b/src/VisualStudio/Core/Def/Options/VisualStudioOptionStorage.cs
@@ -408,6 +408,7 @@ public bool TryFetch(LocalUserRegistryOptionPersister persister, OptionKey2 opti
         {"csharp_split_string_literal_on_return", new RoamingProfileStorage("TextEditor.CSharp.Specific.SplitStringLiterals")},
         {"visual_studio_open_stack_trace_explorer_on_focus", new RoamingProfileStorage("StackTraceExplorer.Options.OpenOnFocus")},
         {"visual_studio_enable_document_outline", new RoamingProfileStorage(@"DocumentOutline.Enable")},
+        {"visual_studio_document_outline_sort_order", new RoamingProfileStorage(@"DocumentOutline.SortOrder")},
         {"visual_studio_enable_symbol_search", new LocalUserProfileStorage(@"Roslyn\Features\SymbolSearch", "Enabled")},
         {"dotnet_search_nuget_packages", new RoamingProfileStorage("TextEditor.%LANGUAGE%.Specific.SuggestForTypesInNuGetPackages")},
         {"dotnet_search_reference_assemblies", new RoamingProfileStorage("TextEditor.%LANGUAGE%.Specific.SuggestForTypesInReferenceAssemblies")},
diff --git a/src/VisualStudio/Core/Def/ServicesVSResources.resx b/src/VisualStudio/Core/Def/ServicesVSResources.resx
index c275b06aa905c..0c5cb04017a5d 100644
--- a/src/VisualStudio/Core/Def/ServicesVSResources.resx
+++ b/src/VisualStudio/Core/Def/ServicesVSResources.resx
@@ -1961,21 +1961,6 @@ Additional information: {1}</value>
   <data name="Document_Outline_Search" xml:space="preserve">
     <value>Search Document Outline</value>
   </data>
-  <data name="Document_Outline_Collapse_All" xml:space="preserve">
-    <value>Collapse All</value>
-  </data>
-  <data name="Document_Outline_Expand_All" xml:space="preserve">
-    <value>Expand All</value>
-  </data>
-  <data name="Document_Outline_Sort_Name" xml:space="preserve">
-    <value>Sort By Name</value>
-  </data>
-  <data name="Document_Outline_Sort_Order" xml:space="preserve">
-    <value>Sort By Order</value>
-  </data>
-  <data name="Document_Outline_Sort_Type" xml:space="preserve">
-    <value>Sort By Type</value>
-  </data>
   <data name="Rename" xml:space="preserve">
     <value>Rename</value>
   </data>
diff --git a/src/VisualStudio/Core/Def/xlf/Commands.vsct.cs.xlf b/src/VisualStudio/Core/Def/xlf/Commands.vsct.cs.xlf
index 2414a42462cd4..73de65a705232 100644
--- a/src/VisualStudio/Core/Def/xlf/Commands.vsct.cs.xlf
+++ b/src/VisualStudio/Core/Def/xlf/Commands.vsct.cs.xlf
@@ -182,6 +182,116 @@
         <target state="translated">RemoveAndSort</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ButtonText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|LocCanonicalName">
+        <source>DocumentOutlineCollapseAll</source>
+        <target state="new">DocumentOutlineCollapseAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|MenuText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ToolTipText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ButtonText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|LocCanonicalName">
+        <source>DocumentOutlineExpandAll</source>
+        <target state="new">DocumentOutlineExpandAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|MenuText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ToolTipText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ButtonText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|LocCanonicalName">
+        <source>DocumentOutlineSortByName</source>
+        <target state="new">DocumentOutlineSortByName</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|MenuText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ToolTipText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ButtonText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|LocCanonicalName">
+        <source>DocumentOutlineSortByOrder</source>
+        <target state="new">DocumentOutlineSortByOrder</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|MenuText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ToolTipText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ButtonText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|LocCanonicalName">
+        <source>DocumentOutlineSortByType</source>
+        <target state="new">DocumentOutlineSortByType</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|MenuText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ToolTipText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|ButtonText">
+        <source>Document Outline</source>
+        <target state="new">Document Outline</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|LocCanonicalName">
+        <source>RoslynDocumentOutlineToolbar</source>
+        <target state="new">RoslynDocumentOutlineToolbar</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidErrorListSetSeverityDefault|ButtonText">
         <source>&amp;Default</source>
         <target state="new">&amp;Default</target>
diff --git a/src/VisualStudio/Core/Def/xlf/Commands.vsct.de.xlf b/src/VisualStudio/Core/Def/xlf/Commands.vsct.de.xlf
index 13b4afb26a8d6..1b691d303d30a 100644
--- a/src/VisualStudio/Core/Def/xlf/Commands.vsct.de.xlf
+++ b/src/VisualStudio/Core/Def/xlf/Commands.vsct.de.xlf
@@ -182,6 +182,116 @@
         <target state="translated">RemoveAndSort</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ButtonText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|LocCanonicalName">
+        <source>DocumentOutlineCollapseAll</source>
+        <target state="new">DocumentOutlineCollapseAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|MenuText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ToolTipText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ButtonText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|LocCanonicalName">
+        <source>DocumentOutlineExpandAll</source>
+        <target state="new">DocumentOutlineExpandAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|MenuText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ToolTipText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ButtonText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|LocCanonicalName">
+        <source>DocumentOutlineSortByName</source>
+        <target state="new">DocumentOutlineSortByName</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|MenuText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ToolTipText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ButtonText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|LocCanonicalName">
+        <source>DocumentOutlineSortByOrder</source>
+        <target state="new">DocumentOutlineSortByOrder</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|MenuText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ToolTipText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ButtonText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|LocCanonicalName">
+        <source>DocumentOutlineSortByType</source>
+        <target state="new">DocumentOutlineSortByType</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|MenuText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ToolTipText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|ButtonText">
+        <source>Document Outline</source>
+        <target state="new">Document Outline</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|LocCanonicalName">
+        <source>RoslynDocumentOutlineToolbar</source>
+        <target state="new">RoslynDocumentOutlineToolbar</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidErrorListSetSeverityDefault|ButtonText">
         <source>&amp;Default</source>
         <target state="new">&amp;Default</target>
diff --git a/src/VisualStudio/Core/Def/xlf/Commands.vsct.es.xlf b/src/VisualStudio/Core/Def/xlf/Commands.vsct.es.xlf
index 92800942c7067..5e06357e6edde 100644
--- a/src/VisualStudio/Core/Def/xlf/Commands.vsct.es.xlf
+++ b/src/VisualStudio/Core/Def/xlf/Commands.vsct.es.xlf
@@ -182,6 +182,116 @@
         <target state="translated">RemoveAndSort</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ButtonText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|LocCanonicalName">
+        <source>DocumentOutlineCollapseAll</source>
+        <target state="new">DocumentOutlineCollapseAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|MenuText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ToolTipText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ButtonText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|LocCanonicalName">
+        <source>DocumentOutlineExpandAll</source>
+        <target state="new">DocumentOutlineExpandAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|MenuText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ToolTipText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ButtonText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|LocCanonicalName">
+        <source>DocumentOutlineSortByName</source>
+        <target state="new">DocumentOutlineSortByName</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|MenuText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ToolTipText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ButtonText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|LocCanonicalName">
+        <source>DocumentOutlineSortByOrder</source>
+        <target state="new">DocumentOutlineSortByOrder</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|MenuText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ToolTipText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ButtonText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|LocCanonicalName">
+        <source>DocumentOutlineSortByType</source>
+        <target state="new">DocumentOutlineSortByType</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|MenuText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ToolTipText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|ButtonText">
+        <source>Document Outline</source>
+        <target state="new">Document Outline</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|LocCanonicalName">
+        <source>RoslynDocumentOutlineToolbar</source>
+        <target state="new">RoslynDocumentOutlineToolbar</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidErrorListSetSeverityDefault|ButtonText">
         <source>&amp;Default</source>
         <target state="new">&amp;Default</target>
diff --git a/src/VisualStudio/Core/Def/xlf/Commands.vsct.fr.xlf b/src/VisualStudio/Core/Def/xlf/Commands.vsct.fr.xlf
index 97d0d370cf14d..6f4ad425b3680 100644
--- a/src/VisualStudio/Core/Def/xlf/Commands.vsct.fr.xlf
+++ b/src/VisualStudio/Core/Def/xlf/Commands.vsct.fr.xlf
@@ -182,6 +182,116 @@
         <target state="translated">RemoveAndSort</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ButtonText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|LocCanonicalName">
+        <source>DocumentOutlineCollapseAll</source>
+        <target state="new">DocumentOutlineCollapseAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|MenuText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ToolTipText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ButtonText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|LocCanonicalName">
+        <source>DocumentOutlineExpandAll</source>
+        <target state="new">DocumentOutlineExpandAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|MenuText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ToolTipText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ButtonText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|LocCanonicalName">
+        <source>DocumentOutlineSortByName</source>
+        <target state="new">DocumentOutlineSortByName</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|MenuText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ToolTipText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ButtonText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|LocCanonicalName">
+        <source>DocumentOutlineSortByOrder</source>
+        <target state="new">DocumentOutlineSortByOrder</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|MenuText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ToolTipText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ButtonText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|LocCanonicalName">
+        <source>DocumentOutlineSortByType</source>
+        <target state="new">DocumentOutlineSortByType</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|MenuText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ToolTipText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|ButtonText">
+        <source>Document Outline</source>
+        <target state="new">Document Outline</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|LocCanonicalName">
+        <source>RoslynDocumentOutlineToolbar</source>
+        <target state="new">RoslynDocumentOutlineToolbar</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidErrorListSetSeverityDefault|ButtonText">
         <source>&amp;Default</source>
         <target state="new">&amp;Default</target>
diff --git a/src/VisualStudio/Core/Def/xlf/Commands.vsct.it.xlf b/src/VisualStudio/Core/Def/xlf/Commands.vsct.it.xlf
index 0a2f354ce30fd..f375449879649 100644
--- a/src/VisualStudio/Core/Def/xlf/Commands.vsct.it.xlf
+++ b/src/VisualStudio/Core/Def/xlf/Commands.vsct.it.xlf
@@ -182,6 +182,116 @@
         <target state="translated">RemoveAndSort</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ButtonText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|LocCanonicalName">
+        <source>DocumentOutlineCollapseAll</source>
+        <target state="new">DocumentOutlineCollapseAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|MenuText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ToolTipText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ButtonText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|LocCanonicalName">
+        <source>DocumentOutlineExpandAll</source>
+        <target state="new">DocumentOutlineExpandAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|MenuText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ToolTipText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ButtonText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|LocCanonicalName">
+        <source>DocumentOutlineSortByName</source>
+        <target state="new">DocumentOutlineSortByName</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|MenuText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ToolTipText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ButtonText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|LocCanonicalName">
+        <source>DocumentOutlineSortByOrder</source>
+        <target state="new">DocumentOutlineSortByOrder</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|MenuText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ToolTipText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ButtonText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|LocCanonicalName">
+        <source>DocumentOutlineSortByType</source>
+        <target state="new">DocumentOutlineSortByType</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|MenuText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ToolTipText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|ButtonText">
+        <source>Document Outline</source>
+        <target state="new">Document Outline</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|LocCanonicalName">
+        <source>RoslynDocumentOutlineToolbar</source>
+        <target state="new">RoslynDocumentOutlineToolbar</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidErrorListSetSeverityDefault|ButtonText">
         <source>&amp;Default</source>
         <target state="new">&amp;Default</target>
diff --git a/src/VisualStudio/Core/Def/xlf/Commands.vsct.ja.xlf b/src/VisualStudio/Core/Def/xlf/Commands.vsct.ja.xlf
index d3e6cd3ea20cc..55efb45c0de4f 100644
--- a/src/VisualStudio/Core/Def/xlf/Commands.vsct.ja.xlf
+++ b/src/VisualStudio/Core/Def/xlf/Commands.vsct.ja.xlf
@@ -182,6 +182,116 @@
         <target state="translated">RemoveAndSort</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ButtonText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|LocCanonicalName">
+        <source>DocumentOutlineCollapseAll</source>
+        <target state="new">DocumentOutlineCollapseAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|MenuText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ToolTipText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ButtonText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|LocCanonicalName">
+        <source>DocumentOutlineExpandAll</source>
+        <target state="new">DocumentOutlineExpandAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|MenuText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ToolTipText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ButtonText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|LocCanonicalName">
+        <source>DocumentOutlineSortByName</source>
+        <target state="new">DocumentOutlineSortByName</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|MenuText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ToolTipText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ButtonText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|LocCanonicalName">
+        <source>DocumentOutlineSortByOrder</source>
+        <target state="new">DocumentOutlineSortByOrder</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|MenuText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ToolTipText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ButtonText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|LocCanonicalName">
+        <source>DocumentOutlineSortByType</source>
+        <target state="new">DocumentOutlineSortByType</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|MenuText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ToolTipText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|ButtonText">
+        <source>Document Outline</source>
+        <target state="new">Document Outline</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|LocCanonicalName">
+        <source>RoslynDocumentOutlineToolbar</source>
+        <target state="new">RoslynDocumentOutlineToolbar</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidErrorListSetSeverityDefault|ButtonText">
         <source>&amp;Default</source>
         <target state="new">&amp;Default</target>
diff --git a/src/VisualStudio/Core/Def/xlf/Commands.vsct.ko.xlf b/src/VisualStudio/Core/Def/xlf/Commands.vsct.ko.xlf
index aaf9fe759faeb..3e79866cf4ce6 100644
--- a/src/VisualStudio/Core/Def/xlf/Commands.vsct.ko.xlf
+++ b/src/VisualStudio/Core/Def/xlf/Commands.vsct.ko.xlf
@@ -182,6 +182,116 @@
         <target state="translated">RemoveAndSort</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ButtonText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|LocCanonicalName">
+        <source>DocumentOutlineCollapseAll</source>
+        <target state="new">DocumentOutlineCollapseAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|MenuText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ToolTipText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ButtonText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|LocCanonicalName">
+        <source>DocumentOutlineExpandAll</source>
+        <target state="new">DocumentOutlineExpandAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|MenuText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ToolTipText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ButtonText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|LocCanonicalName">
+        <source>DocumentOutlineSortByName</source>
+        <target state="new">DocumentOutlineSortByName</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|MenuText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ToolTipText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ButtonText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|LocCanonicalName">
+        <source>DocumentOutlineSortByOrder</source>
+        <target state="new">DocumentOutlineSortByOrder</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|MenuText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ToolTipText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ButtonText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|LocCanonicalName">
+        <source>DocumentOutlineSortByType</source>
+        <target state="new">DocumentOutlineSortByType</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|MenuText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ToolTipText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|ButtonText">
+        <source>Document Outline</source>
+        <target state="new">Document Outline</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|LocCanonicalName">
+        <source>RoslynDocumentOutlineToolbar</source>
+        <target state="new">RoslynDocumentOutlineToolbar</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidErrorListSetSeverityDefault|ButtonText">
         <source>&amp;Default</source>
         <target state="new">&amp;Default</target>
diff --git a/src/VisualStudio/Core/Def/xlf/Commands.vsct.pl.xlf b/src/VisualStudio/Core/Def/xlf/Commands.vsct.pl.xlf
index fdb6f0a7ee2c5..60d7906e2dc31 100644
--- a/src/VisualStudio/Core/Def/xlf/Commands.vsct.pl.xlf
+++ b/src/VisualStudio/Core/Def/xlf/Commands.vsct.pl.xlf
@@ -182,6 +182,116 @@
         <target state="translated">RemoveAndSort</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ButtonText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|LocCanonicalName">
+        <source>DocumentOutlineCollapseAll</source>
+        <target state="new">DocumentOutlineCollapseAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|MenuText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ToolTipText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ButtonText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|LocCanonicalName">
+        <source>DocumentOutlineExpandAll</source>
+        <target state="new">DocumentOutlineExpandAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|MenuText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ToolTipText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ButtonText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|LocCanonicalName">
+        <source>DocumentOutlineSortByName</source>
+        <target state="new">DocumentOutlineSortByName</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|MenuText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ToolTipText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ButtonText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|LocCanonicalName">
+        <source>DocumentOutlineSortByOrder</source>
+        <target state="new">DocumentOutlineSortByOrder</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|MenuText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ToolTipText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ButtonText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|LocCanonicalName">
+        <source>DocumentOutlineSortByType</source>
+        <target state="new">DocumentOutlineSortByType</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|MenuText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ToolTipText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|ButtonText">
+        <source>Document Outline</source>
+        <target state="new">Document Outline</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|LocCanonicalName">
+        <source>RoslynDocumentOutlineToolbar</source>
+        <target state="new">RoslynDocumentOutlineToolbar</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidErrorListSetSeverityDefault|ButtonText">
         <source>&amp;Default</source>
         <target state="new">&amp;Default</target>
diff --git a/src/VisualStudio/Core/Def/xlf/Commands.vsct.pt-BR.xlf b/src/VisualStudio/Core/Def/xlf/Commands.vsct.pt-BR.xlf
index 8e14c31758dce..e1e6a8f71d6f6 100644
--- a/src/VisualStudio/Core/Def/xlf/Commands.vsct.pt-BR.xlf
+++ b/src/VisualStudio/Core/Def/xlf/Commands.vsct.pt-BR.xlf
@@ -182,6 +182,116 @@
         <target state="translated">RemoveAndSort</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ButtonText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|LocCanonicalName">
+        <source>DocumentOutlineCollapseAll</source>
+        <target state="new">DocumentOutlineCollapseAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|MenuText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ToolTipText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ButtonText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|LocCanonicalName">
+        <source>DocumentOutlineExpandAll</source>
+        <target state="new">DocumentOutlineExpandAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|MenuText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ToolTipText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ButtonText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|LocCanonicalName">
+        <source>DocumentOutlineSortByName</source>
+        <target state="new">DocumentOutlineSortByName</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|MenuText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ToolTipText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ButtonText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|LocCanonicalName">
+        <source>DocumentOutlineSortByOrder</source>
+        <target state="new">DocumentOutlineSortByOrder</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|MenuText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ToolTipText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ButtonText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|LocCanonicalName">
+        <source>DocumentOutlineSortByType</source>
+        <target state="new">DocumentOutlineSortByType</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|MenuText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ToolTipText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|ButtonText">
+        <source>Document Outline</source>
+        <target state="new">Document Outline</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|LocCanonicalName">
+        <source>RoslynDocumentOutlineToolbar</source>
+        <target state="new">RoslynDocumentOutlineToolbar</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidErrorListSetSeverityDefault|ButtonText">
         <source>&amp;Default</source>
         <target state="new">&amp;Default</target>
diff --git a/src/VisualStudio/Core/Def/xlf/Commands.vsct.ru.xlf b/src/VisualStudio/Core/Def/xlf/Commands.vsct.ru.xlf
index c9080f826428b..a48596deae61f 100644
--- a/src/VisualStudio/Core/Def/xlf/Commands.vsct.ru.xlf
+++ b/src/VisualStudio/Core/Def/xlf/Commands.vsct.ru.xlf
@@ -182,6 +182,116 @@
         <target state="translated">RemoveAndSort</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ButtonText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|LocCanonicalName">
+        <source>DocumentOutlineCollapseAll</source>
+        <target state="new">DocumentOutlineCollapseAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|MenuText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ToolTipText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ButtonText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|LocCanonicalName">
+        <source>DocumentOutlineExpandAll</source>
+        <target state="new">DocumentOutlineExpandAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|MenuText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ToolTipText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ButtonText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|LocCanonicalName">
+        <source>DocumentOutlineSortByName</source>
+        <target state="new">DocumentOutlineSortByName</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|MenuText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ToolTipText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ButtonText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|LocCanonicalName">
+        <source>DocumentOutlineSortByOrder</source>
+        <target state="new">DocumentOutlineSortByOrder</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|MenuText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ToolTipText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ButtonText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|LocCanonicalName">
+        <source>DocumentOutlineSortByType</source>
+        <target state="new">DocumentOutlineSortByType</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|MenuText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ToolTipText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|ButtonText">
+        <source>Document Outline</source>
+        <target state="new">Document Outline</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|LocCanonicalName">
+        <source>RoslynDocumentOutlineToolbar</source>
+        <target state="new">RoslynDocumentOutlineToolbar</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidErrorListSetSeverityDefault|ButtonText">
         <source>&amp;Default</source>
         <target state="new">&amp;Default</target>
diff --git a/src/VisualStudio/Core/Def/xlf/Commands.vsct.tr.xlf b/src/VisualStudio/Core/Def/xlf/Commands.vsct.tr.xlf
index b4e8601a09649..27a1f3e5d7e0d 100644
--- a/src/VisualStudio/Core/Def/xlf/Commands.vsct.tr.xlf
+++ b/src/VisualStudio/Core/Def/xlf/Commands.vsct.tr.xlf
@@ -182,6 +182,116 @@
         <target state="translated">RemoveAndSort</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ButtonText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|LocCanonicalName">
+        <source>DocumentOutlineCollapseAll</source>
+        <target state="new">DocumentOutlineCollapseAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|MenuText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ToolTipText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ButtonText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|LocCanonicalName">
+        <source>DocumentOutlineExpandAll</source>
+        <target state="new">DocumentOutlineExpandAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|MenuText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ToolTipText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ButtonText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|LocCanonicalName">
+        <source>DocumentOutlineSortByName</source>
+        <target state="new">DocumentOutlineSortByName</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|MenuText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ToolTipText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ButtonText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|LocCanonicalName">
+        <source>DocumentOutlineSortByOrder</source>
+        <target state="new">DocumentOutlineSortByOrder</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|MenuText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ToolTipText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ButtonText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|LocCanonicalName">
+        <source>DocumentOutlineSortByType</source>
+        <target state="new">DocumentOutlineSortByType</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|MenuText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ToolTipText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|ButtonText">
+        <source>Document Outline</source>
+        <target state="new">Document Outline</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|LocCanonicalName">
+        <source>RoslynDocumentOutlineToolbar</source>
+        <target state="new">RoslynDocumentOutlineToolbar</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidErrorListSetSeverityDefault|ButtonText">
         <source>&amp;Default</source>
         <target state="new">&amp;Default</target>
diff --git a/src/VisualStudio/Core/Def/xlf/Commands.vsct.zh-Hans.xlf b/src/VisualStudio/Core/Def/xlf/Commands.vsct.zh-Hans.xlf
index b1ecce0029189..19c37c76b6fac 100644
--- a/src/VisualStudio/Core/Def/xlf/Commands.vsct.zh-Hans.xlf
+++ b/src/VisualStudio/Core/Def/xlf/Commands.vsct.zh-Hans.xlf
@@ -182,6 +182,116 @@
         <target state="translated">RemoveAndSort</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ButtonText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|LocCanonicalName">
+        <source>DocumentOutlineCollapseAll</source>
+        <target state="new">DocumentOutlineCollapseAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|MenuText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ToolTipText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ButtonText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|LocCanonicalName">
+        <source>DocumentOutlineExpandAll</source>
+        <target state="new">DocumentOutlineExpandAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|MenuText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ToolTipText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ButtonText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|LocCanonicalName">
+        <source>DocumentOutlineSortByName</source>
+        <target state="new">DocumentOutlineSortByName</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|MenuText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ToolTipText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ButtonText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|LocCanonicalName">
+        <source>DocumentOutlineSortByOrder</source>
+        <target state="new">DocumentOutlineSortByOrder</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|MenuText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ToolTipText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ButtonText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|LocCanonicalName">
+        <source>DocumentOutlineSortByType</source>
+        <target state="new">DocumentOutlineSortByType</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|MenuText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ToolTipText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|ButtonText">
+        <source>Document Outline</source>
+        <target state="new">Document Outline</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|LocCanonicalName">
+        <source>RoslynDocumentOutlineToolbar</source>
+        <target state="new">RoslynDocumentOutlineToolbar</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidErrorListSetSeverityDefault|ButtonText">
         <source>&amp;Default</source>
         <target state="new">&amp;Default</target>
diff --git a/src/VisualStudio/Core/Def/xlf/Commands.vsct.zh-Hant.xlf b/src/VisualStudio/Core/Def/xlf/Commands.vsct.zh-Hant.xlf
index 790d70343aa58..46f628d787209 100644
--- a/src/VisualStudio/Core/Def/xlf/Commands.vsct.zh-Hant.xlf
+++ b/src/VisualStudio/Core/Def/xlf/Commands.vsct.zh-Hant.xlf
@@ -182,6 +182,116 @@
         <target state="translated">RemoveAndSort</target>
         <note />
       </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ButtonText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|LocCanonicalName">
+        <source>DocumentOutlineCollapseAll</source>
+        <target state="new">DocumentOutlineCollapseAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|MenuText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineCollapseAll|ToolTipText">
+        <source>Collapse All</source>
+        <target state="new">Collapse All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ButtonText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|LocCanonicalName">
+        <source>DocumentOutlineExpandAll</source>
+        <target state="new">DocumentOutlineExpandAll</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|MenuText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineExpandAll|ToolTipText">
+        <source>Expand All</source>
+        <target state="new">Expand All</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ButtonText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|LocCanonicalName">
+        <source>DocumentOutlineSortByName</source>
+        <target state="new">DocumentOutlineSortByName</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|MenuText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByName|ToolTipText">
+        <source>Sort By Name</source>
+        <target state="new">Sort By Name</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ButtonText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|LocCanonicalName">
+        <source>DocumentOutlineSortByOrder</source>
+        <target state="new">DocumentOutlineSortByOrder</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|MenuText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByOrder|ToolTipText">
+        <source>Sort By Order</source>
+        <target state="new">Sort By Order</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ButtonText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|LocCanonicalName">
+        <source>DocumentOutlineSortByType</source>
+        <target state="new">DocumentOutlineSortByType</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|MenuText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineSortByType|ToolTipText">
+        <source>Sort By Type</source>
+        <target state="new">Sort By Type</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|ButtonText">
+        <source>Document Outline</source>
+        <target state="new">Document Outline</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="cmdidDocumentOutlineToolbar|LocCanonicalName">
+        <source>RoslynDocumentOutlineToolbar</source>
+        <target state="new">RoslynDocumentOutlineToolbar</target>
+        <note />
+      </trans-unit>
       <trans-unit id="cmdidErrorListSetSeverityDefault|ButtonText">
         <source>&amp;Default</source>
         <target state="new">&amp;Default</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
index 4e3f516cc527b..fa731e2f9ff5e 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
@@ -362,36 +362,11 @@
         <target state="translated">Osnova dokumentu</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Collapse_All">
-        <source>Collapse All</source>
-        <target state="translated">Všechno sbalit</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Expand_All">
-        <source>Expand All</source>
-        <target state="translated">Rozbalit vše</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Document_Outline_Search">
         <source>Search Document Outline</source>
         <target state="translated">Prohledat osnovu dokumentu</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Name">
-        <source>Sort By Name</source>
-        <target state="translated">Seřadit podle názvu</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Order">
-        <source>Sort By Order</source>
-        <target state="translated">Seřadit podle pořadí</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Type">
-        <source>Sort By Type</source>
-        <target state="translated">Seřadit podle typu</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">_Upravit</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
index bb6ace886c612..4e3f28b2b2320 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
@@ -362,36 +362,11 @@
         <target state="translated">Dokumentgliederung</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Collapse_All">
-        <source>Collapse All</source>
-        <target state="translated">Alle reduzieren</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Expand_All">
-        <source>Expand All</source>
-        <target state="translated">Alle erweitern</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Document_Outline_Search">
         <source>Search Document Outline</source>
         <target state="translated">Dokumentgliederung durchsuchen</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Name">
-        <source>Sort By Name</source>
-        <target state="translated">Nach Namen sortieren</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Order">
-        <source>Sort By Order</source>
-        <target state="translated">Nach Reihenfolge sortieren</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Type">
-        <source>Sort By Type</source>
-        <target state="translated">Nach Typ sortieren</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">_Bearbeiten</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
index e498d9609eb02..4bf1ccd297629 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
@@ -362,36 +362,11 @@
         <target state="translated">Esquema del documento</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Collapse_All">
-        <source>Collapse All</source>
-        <target state="translated">Contraer todo</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Expand_All">
-        <source>Expand All</source>
-        <target state="translated">Expandir todo</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Document_Outline_Search">
         <source>Search Document Outline</source>
         <target state="translated">Esquema del documento de búsqueda</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Name">
-        <source>Sort By Name</source>
-        <target state="translated">Ordenar por nombre</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Order">
-        <source>Sort By Order</source>
-        <target state="translated">Ordenar por orden</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Type">
-        <source>Sort By Type</source>
-        <target state="translated">Ordenar por tipo</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">_Editar</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
index 9ef8d74b4d168..384b99fc0bc7e 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
@@ -362,36 +362,11 @@
         <target state="translated">Structure du document</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Collapse_All">
-        <source>Collapse All</source>
-        <target state="translated">Tout réduire</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Expand_All">
-        <source>Expand All</source>
-        <target state="translated">Développer tout</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Document_Outline_Search">
         <source>Search Document Outline</source>
         <target state="translated">Rechercher dans le plan du document</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Name">
-        <source>Sort By Name</source>
-        <target state="translated">Trier par nom</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Order">
-        <source>Sort By Order</source>
-        <target state="translated">Trier par ordre</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Type">
-        <source>Sort By Type</source>
-        <target state="translated">Trier par type</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">_Modifier</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
index ec360d23135c5..1aa4a848b8751 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
@@ -362,36 +362,11 @@
         <target state="translated">Struttura documento</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Collapse_All">
-        <source>Collapse All</source>
-        <target state="translated">Comprimi tutto</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Expand_All">
-        <source>Expand All</source>
-        <target state="translated">Espandi tutto</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Document_Outline_Search">
         <source>Search Document Outline</source>
         <target state="translated">Struttura documento di ricerca</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Name">
-        <source>Sort By Name</source>
-        <target state="translated">Ordina per nome</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Order">
-        <source>Sort By Order</source>
-        <target state="translated">Ordina per ordine</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Type">
-        <source>Sort By Type</source>
-        <target state="translated">Ordina per tipo</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">_Modifica</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
index 0d1336718f1f4..a92787e64d156 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
@@ -362,36 +362,11 @@
         <target state="translated">ドキュメント アウトライン</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Collapse_All">
-        <source>Collapse All</source>
-        <target state="translated">すべて折りたたむ</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Expand_All">
-        <source>Expand All</source>
-        <target state="translated">すべて展開</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Document_Outline_Search">
         <source>Search Document Outline</source>
         <target state="translated">ドキュメント アウトラインの検索</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Name">
-        <source>Sort By Name</source>
-        <target state="translated">名前で並べ替え</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Order">
-        <source>Sort By Order</source>
-        <target state="translated">順番に並べ替え</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Type">
-        <source>Sort By Type</source>
-        <target state="translated">種類で並べ替え</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">編集(_E)</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
index 349f24c071817..0ff518cce4e5a 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
@@ -362,36 +362,11 @@
         <target state="translated">문서 개요</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Collapse_All">
-        <source>Collapse All</source>
-        <target state="translated">모두 축소</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Expand_All">
-        <source>Expand All</source>
-        <target state="translated">모두 확장</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Document_Outline_Search">
         <source>Search Document Outline</source>
         <target state="translated">문서 개요 검색</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Name">
-        <source>Sort By Name</source>
-        <target state="translated">이름순 정렬</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Order">
-        <source>Sort By Order</source>
-        <target state="translated">정렬 기준 순서</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Type">
-        <source>Sort By Type</source>
-        <target state="translated">형식순 정렬</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">편집(_E)</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
index 91c994e7304db..7e3d79a038c7e 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
@@ -362,36 +362,11 @@
         <target state="translated">Konspekt dokumentu</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Collapse_All">
-        <source>Collapse All</source>
-        <target state="translated">Zwiń wszystko</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Expand_All">
-        <source>Expand All</source>
-        <target state="translated">Rozwiń wszystkie</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Document_Outline_Search">
         <source>Search Document Outline</source>
         <target state="translated">Przeszukaj konspekt dokumentu</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Name">
-        <source>Sort By Name</source>
-        <target state="translated">Sortuj według nazwy</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Order">
-        <source>Sort By Order</source>
-        <target state="translated">Sortuj według kolejności</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Type">
-        <source>Sort By Type</source>
-        <target state="translated">Sortuj według typu</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">_Edytuj</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
index 86052411d481c..9211701905212 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
@@ -362,36 +362,11 @@
         <target state="translated">Estrutura de Tópicos do Documento</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Collapse_All">
-        <source>Collapse All</source>
-        <target state="translated">Recolher Tudo</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Expand_All">
-        <source>Expand All</source>
-        <target state="translated">Expandir Tudo</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Document_Outline_Search">
         <source>Search Document Outline</source>
         <target state="translated">Estrutura de Tópicos do Documento de Pesquisa</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Name">
-        <source>Sort By Name</source>
-        <target state="translated">Classificar Por Nome</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Order">
-        <source>Sort By Order</source>
-        <target state="translated">Classificar Por Ordem</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Type">
-        <source>Sort By Type</source>
-        <target state="translated">Classificar Por Tipo</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">_Editar</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
index e9ac7c09832bd..f4c1fc9ccecc5 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
@@ -362,36 +362,11 @@
         <target state="translated">Структура документа</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Collapse_All">
-        <source>Collapse All</source>
-        <target state="translated">Свернуть все</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Expand_All">
-        <source>Expand All</source>
-        <target state="translated">Развернуть все</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Document_Outline_Search">
         <source>Search Document Outline</source>
         <target state="translated">Поиск структуры документа</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Name">
-        <source>Sort By Name</source>
-        <target state="translated">Сортировать по имени</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Order">
-        <source>Sort By Order</source>
-        <target state="translated">Сортировать по порядку</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Type">
-        <source>Sort By Type</source>
-        <target state="translated">Сортировать по типу</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">_Изменить</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
index b4c840d539e78..a26b1ec0ca0ac 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
@@ -362,36 +362,11 @@
         <target state="translated">Belge Ana Hattı</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Collapse_All">
-        <source>Collapse All</source>
-        <target state="translated">Tümünü Daralt</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Expand_All">
-        <source>Expand All</source>
-        <target state="translated">Tümünü Genişlet</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Document_Outline_Search">
         <source>Search Document Outline</source>
         <target state="translated">Belge Ana Hattını Ara</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Name">
-        <source>Sort By Name</source>
-        <target state="translated">Ada Göre Sırala</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Order">
-        <source>Sort By Order</source>
-        <target state="translated">Sıralamaya Göre Sırala</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Type">
-        <source>Sort By Type</source>
-        <target state="translated">Türe Göre Sırala</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">_Düzenle</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
index 54b8e370c623d..114fa81d2fa23 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
@@ -362,36 +362,11 @@
         <target state="translated">文档大纲</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Collapse_All">
-        <source>Collapse All</source>
-        <target state="translated">全部折叠</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Expand_All">
-        <source>Expand All</source>
-        <target state="translated">全部展开</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Document_Outline_Search">
         <source>Search Document Outline</source>
         <target state="translated">搜索文档大纲</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Name">
-        <source>Sort By Name</source>
-        <target state="translated">按名称排序</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Order">
-        <source>Sort By Order</source>
-        <target state="translated">按顺序排序</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Type">
-        <source>Sort By Type</source>
-        <target state="translated">按类型排序</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">编辑(_E)</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
index d6195861cd0fd..678ab58eae049 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
@@ -362,36 +362,11 @@
         <target state="translated">文件大綱</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Collapse_All">
-        <source>Collapse All</source>
-        <target state="translated">全部摺疊</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Expand_All">
-        <source>Expand All</source>
-        <target state="translated">全部展開</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Document_Outline_Search">
         <source>Search Document Outline</source>
         <target state="translated">搜尋檔大綱</target>
         <note />
       </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Name">
-        <source>Sort By Name</source>
-        <target state="translated">依名稱排序</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Order">
-        <source>Sort By Order</source>
-        <target state="translated">依順序排序</target>
-        <note />
-      </trans-unit>
-      <trans-unit id="Document_Outline_Sort_Type">
-        <source>Sort By Type</source>
-        <target state="translated">依類型排序</target>
-        <note />
-      </trans-unit>
       <trans-unit id="Edit">
         <source>_Edit</source>
         <target state="translated">編輯(_E)</target>