diff --git a/src/NuGet.Clients/PackageManagement.UI/PackageLoader.cs b/src/NuGet.Clients/PackageManagement.UI/PackageLoader.cs
index 2a3f4ff73e0..3f44b6bae6b 100644
--- a/src/NuGet.Clients/PackageManagement.UI/PackageLoader.cs
+++ b/src/NuGet.Clients/PackageManagement.UI/PackageLoader.cs
@@ -446,15 +446,16 @@ private async Task<SearchResult> SearchUpdatesAsync(int startIndex, Cancellation
             };
         }
 
-        // Creates the list of installed packages that have updates available
-        private async Task CreatePackagesWithUpdatesAsync(CancellationToken ct)
+        // Creates the list of installed packages that have updates available.
+        // Returns the number of packages that have updates available.
+        public async Task<int> CreatePackagesWithUpdatesAsync(CancellationToken ct)
         {
             _packagesWithUpdates = new List<UISearchMetadata>();
             var metadataResource = await _sourceRepository.GetResourceAsync<UIMetadataResource>();
 
             if (metadataResource == null)
             {
-                return;
+                return 0;
             }
 
             var installedPackages = (await GetInstalledPackagesAsync(latest: false, token: ct))
@@ -487,6 +488,8 @@ private async Task CreatePackagesWithUpdatesAsync(CancellationToken ct)
                     }
                 }
             }
+
+            return _packagesWithUpdates.Count;
         }
 
         public async Task<LoadResult> LoadItemsAsync(int startIndex, CancellationToken cancellationToken)
diff --git a/src/NuGet.Clients/PackageManagement.UI/PackageManagement.UI.csproj b/src/NuGet.Clients/PackageManagement.UI/PackageManagement.UI.csproj
index 2613e5a2d3b..634b2738b23 100644
--- a/src/NuGet.Clients/PackageManagement.UI/PackageManagement.UI.csproj
+++ b/src/NuGet.Clients/PackageManagement.UI/PackageManagement.UI.csproj
@@ -157,6 +157,9 @@
     <Compile Include="Xamls\FileConflictDialog.xaml.cs">
       <DependentUpon>FileConflictDialog.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Xamls\FilterLabel.xaml.cs">
+      <DependentUpon>FilterLabel.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Xamls\InstalledIndicator.xaml.cs">
       <DependentUpon>InstalledIndicator.xaml</DependentUpon>
     </Compile>
@@ -174,6 +177,9 @@
       <DependentUpon>PackageManagerControl.xaml</DependentUpon>
     </Compile>
     <Compile Include="Converters\PackageStatusToInstallImageConverter.cs" />
+    <Compile Include="Xamls\PackageManagerTopPanel.xaml.cs">
+      <DependentUpon>PackageManagerTopPanel.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Xamls\PackageMetadataControl.xaml.cs">
       <DependentUpon>PackageMetadataControl.xaml</DependentUpon>
     </Compile>
@@ -218,6 +224,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Xamls\FilterLabel.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Xamls\InstalledIndicator.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -238,6 +248,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Xamls\PackageManagerTopPanel.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Xamls\PackageMetadataControl.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/src/NuGet.Clients/PackageManagement.UI/Resources.Designer.cs b/src/NuGet.Clients/PackageManagement.UI/Resources.Designer.cs
index 7d0b63d82c9..74b3b2fcabc 100644
--- a/src/NuGet.Clients/PackageManagement.UI/Resources.Designer.cs
+++ b/src/NuGet.Clients/PackageManagement.UI/Resources.Designer.cs
@@ -1,7 +1,7 @@
 //------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
-//     Runtime Version:4.0.30319.0
+//     Runtime Version:4.0.30319.42000
 //
 //     Changes to this file may cause incorrect behavior and will be lost if
 //     the code is regenerated.
@@ -366,33 +366,6 @@ public static string FileConflictAction_Prompt {
             }
         }
         
-        /// <summary>
-        ///   Looks up a localized string similar to All.
-        /// </summary>
-        public static string Filter_All {
-            get {
-                return ResourceManager.GetString("Filter_All", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Installed.
-        /// </summary>
-        public static string Filter_Installed {
-            get {
-                return ResourceManager.GetString("Filter_Installed", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Upgrade available.
-        /// </summary>
-        public static string Filter_UpgradeAvailable {
-            get {
-                return ResourceManager.GetString("Filter_UpgradeAvailable", resourceCulture);
-            }
-        }
-        
         /// <summary>
         ///   Looks up a localized string similar to Ignore for now.
         /// </summary>
@@ -420,6 +393,15 @@ public static string Label_Authors {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Browse.
+        /// </summary>
+        public static string Label_Browse {
+            get {
+                return ResourceManager.GetString("Label_Browse", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Date published:.
         /// </summary>
@@ -492,6 +474,15 @@ public static string Label_InstallationOptions {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Installed.
+        /// </summary>
+        public static string Label_Installed {
+            get {
+                return ResourceManager.GetString("Label_Installed", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Installing:.
         /// </summary>
@@ -627,6 +618,15 @@ public static string Label_UpdatedPackages {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Updates.
+        /// </summary>
+        public static string Label_Updates {
+            get {
+                return ResourceManager.GetString("Label_Updates", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Version:.
         /// </summary>
diff --git a/src/NuGet.Clients/PackageManagement.UI/Resources.resx b/src/NuGet.Clients/PackageManagement.UI/Resources.resx
index 9eb37bd48e9..1db835c154c 100644
--- a/src/NuGet.Clients/PackageManagement.UI/Resources.resx
+++ b/src/NuGet.Clients/PackageManagement.UI/Resources.resx
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <root>
-  <!--
-    Microsoft ResX Schema
-
+  <!-- 
+    Microsoft ResX Schema 
+    
     Version 2.0
-
-    The primary goals of this format is to allow a simple XML format
-    that is mostly human readable. The generation and parsing of the
-    various data types are done through the TypeConverter classes
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
     associated with the data types.
-
+    
     Example:
-
+    
     ... ado.net/XML headers & schema ...
     <resheader name="resmimetype">text/microsoft-resx</resheader>
     <resheader name="version">2.0</resheader>
@@ -26,36 +26,36 @@
         <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
         <comment>This is a comment</comment>
     </data>
-
-    There are any number of "resheader" rows that contain simple
+                
+    There are any number of "resheader" rows that contain simple 
     name/value pairs.
-
-    Each data row contains a name, and value. The row also contains a
-    type or mimetype. Type corresponds to a .NET class that support
-    text/value conversion through the TypeConverter architecture.
-    Classes that don't support this are serialized and stored with the
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
     mimetype set.
-
-    The mimetype is used for serialized objects, and tells the
-    ResXResourceReader how to depersist the object. This is currently not
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
     extensible. For a given mimetype the value must be set accordingly:
-
-    Note - application/x-microsoft.net.object.binary.base64 is the format
-    that the ResXResourceWriter will generate, however the reader can
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
     read any of the formats listed below.
-
+    
     mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
-
+    
     mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with
+    value   : The object must be serialized with 
             : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
             : and then encoded with base64 encoding.
 
     mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array
+    value   : The object must be serialized into a byte array 
             : using a System.ComponentModel.TypeConverter
             : and then encoded with base64 encoding.
     -->
@@ -243,10 +243,10 @@
   <data name="WindowTitle_Preview" xml:space="preserve">
     <value>Preview</value>
   </data>
-  <data name="Filter_All" xml:space="preserve">
-    <value>All</value>
+  <data name="Label_Browse" xml:space="preserve">
+    <value>Browse</value>
   </data>
-  <data name="Filter_Installed" xml:space="preserve">
+  <data name="Label_Installed" xml:space="preserve">
     <value>Installed</value>
   </data>
   <data name="Label_NuGetWindowCaption" xml:space="preserve">
@@ -297,8 +297,8 @@
   <data name="Checkbox_IncludePrerelease" xml:space="preserve">
     <value>Include prerelease</value>
   </data>
-  <data name="Filter_UpgradeAvailable" xml:space="preserve">
-    <value>Upgrade available</value>
+  <data name="Label_Updates" xml:space="preserve">
+    <value>Updates</value>
   </data>
   <data name="Version_Installed" xml:space="preserve">
     <value>Installed</value>
diff --git a/src/NuGet.Clients/PackageManagement.UI/Resources/Brushes.cs b/src/NuGet.Clients/PackageManagement.UI/Resources/Brushes.cs
index 640d6900fa9..0d159adf014 100644
--- a/src/NuGet.Clients/PackageManagement.UI/Resources/Brushes.cs
+++ b/src/NuGet.Clients/PackageManagement.UI/Resources/Brushes.cs
@@ -76,6 +76,7 @@ public static void Initialize()
                 // when the keys are used in an xaml file.
                 ContentBrushKey = SystemColors.WindowBrush;
                 BackgroundBrushKey = SystemColors.WindowBrush;
+                ContentSelectedBrushKey = SystemColors.ActiveCaptionBrushKey;
             }
             else
             {
diff --git a/src/NuGet.Clients/PackageManagement.UI/Xamls/FilterLabel.xaml b/src/NuGet.Clients/PackageManagement.UI/Xamls/FilterLabel.xaml
new file mode 100644
index 00000000000..81c05669a88
--- /dev/null
+++ b/src/NuGet.Clients/PackageManagement.UI/Xamls/FilterLabel.xaml
@@ -0,0 +1,75 @@
+<UserControl x:Class="NuGet.PackageManagement.UI.FilterLabel"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             x:Name="_self"
+             xmlns:local="clr-namespace:NuGet.PackageManagement.UI"
+             mc:Ignorable="d"
+             d:DesignHeight="100" d:DesignWidth="300">
+  <UserControl.Resources>
+    <ResourceDictionary>
+      <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary
+          Source="Resources.xaml" />
+      </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary>
+  </UserControl.Resources>
+  <Grid>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="auto" />
+      <RowDefinition Height="auto" />
+    </Grid.RowDefinitions>
+    <Grid.ColumnDefinitions>
+      <ColumnDefinition />
+      <ColumnDefinition />
+    </Grid.ColumnDefinitions>
+    <Button
+      Grid.Row="0"
+      Grid.Column="0"
+      Click="ButtonClicked">
+      <Button.Template>
+        <ControlTemplate TargetType="{x:Type Button}">
+          <ContentPresenter />
+        </ControlTemplate>
+      </Button.Template>
+      <TextBlock
+        x:Name="_labelText"
+        Padding="0"
+        Margin="0"
+        MouseEnter="_labelText_MouseEnter"
+        MouseLeave="_labelText_MouseLeave"
+        FontSize="{Binding ElementName=_self,Path=FontSize,Converter={StaticResource Font122PercentSizeConverter}}"
+        Foreground="{DynamicResource {x:Static local:Brushes.UIText}}" />
+    </Button>
+
+    <!-- the texblock that displays the count -->
+    <Border
+      x:Name="_textBlockCountContainer"
+      Grid.Row="0"
+      Grid.Column="1"
+      CornerRadius="2"
+      Margin="2,0"
+      Padding="1,0"
+      Visibility="Collapsed"
+      HorizontalAlignment="Center"
+      VerticalAlignment="Top"
+      Background="{DynamicResource {x:Static local:Brushes.ContentSelectedBrushKey}}">
+      <TextBlock
+        x:Name="_textBlockCount"
+        Foreground="White"
+        HorizontalAlignment="Right"
+        VerticalAlignment="Top">
+      </TextBlock>
+    </Border>
+
+    <Rectangle
+      x:Name="_underline"
+      Grid.Row="1"
+      Grid.Column="0"
+      Margin="0"
+      Height="3"
+      Fill="{DynamicResource {x:Static local:Brushes.ContentSelectedBrushKey}}"
+      Visibility="Hidden" />
+  </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/src/NuGet.Clients/PackageManagement.UI/Xamls/FilterLabel.xaml.cs b/src/NuGet.Clients/PackageManagement.UI/Xamls/FilterLabel.xaml.cs
new file mode 100644
index 00000000000..dcfe328d1a2
--- /dev/null
+++ b/src/NuGet.Clients/PackageManagement.UI/Xamls/FilterLabel.xaml.cs
@@ -0,0 +1,131 @@
+using System;
+using System.Globalization;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace NuGet.PackageManagement.UI
+{
+    /// <summary>
+    /// Represents the filter label. E.g. Browse, Installed, Update Available.
+    /// </summary>
+    public partial class FilterLabel : UserControl
+    {
+        public FilterLabel()
+        {
+            InitializeComponent();
+        }
+
+        public event EventHandler<EventArgs> ControlSelected;
+
+        public Filter Filter
+        {
+            get;
+            set;
+        }
+
+        public string Text
+        {
+            get
+            {
+                return _labelText.Text;
+            }
+            set
+            {
+                _labelText.Text = value;
+            }
+        }
+
+        private bool _selected;
+
+        public bool Selected
+        {
+            get
+            {
+                return _selected;
+            }
+            set
+            {
+                _selected = value;
+                if (_selected)
+                {
+                    _labelText.SetResourceReference(
+                        TextBlock.ForegroundProperty,
+                        Brushes.ContentSelectedBrushKey);
+                    _underline.Visibility = Visibility.Visible;
+
+                    if (ControlSelected != null)
+                    {
+                        ControlSelected(this, EventArgs.Empty);
+                    }
+                }
+                else
+                {
+                    _labelText.SetResourceReference(
+                        TextBlock.ForegroundProperty,
+                        Brushes.UIText);
+                    _underline.Visibility = Visibility.Hidden;
+                }
+            }
+        }
+
+        private void ButtonClicked(object sender, RoutedEventArgs e)
+        {
+            if (_selected)
+            {
+                // already selected. Do nothing
+                return;
+            }
+            else
+            {
+                Selected = true;
+            }
+        }
+
+        private int _count;
+
+        public int Count
+        {
+            get
+            {
+                return _count;
+            }
+            set
+            {
+                _count = value;
+                if (_count > 0)
+                {
+                    _textBlockCount.Text = _count.ToString(CultureInfo.CurrentCulture);
+                    _textBlockCountContainer.Visibility = Visibility.Visible;
+                }
+                else
+                {
+                    _textBlockCountContainer.Visibility = Visibility.Collapsed;
+                }
+            }
+        }
+
+        private void _labelText_MouseEnter(object sender, MouseEventArgs e)
+        {
+            _labelText.SetResourceReference(
+                TextBlock.ForegroundProperty,
+                Brushes.ContentSelectedBrushKey);
+        }
+
+        private void _labelText_MouseLeave(object sender, MouseEventArgs e)
+        {
+            if (_selected)
+            {
+                _labelText.SetResourceReference(
+                    TextBlock.ForegroundProperty,
+                    Brushes.ContentSelectedBrushKey);
+            }
+            else
+            {
+                _labelText.SetResourceReference(
+                    TextBlock.ForegroundProperty,
+                    Brushes.UIText);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/NuGet.Clients/PackageManagement.UI/Xamls/PackageManagerControl.xaml b/src/NuGet.Clients/PackageManagement.UI/Xamls/PackageManagerControl.xaml
index fee5eb1ac01..b99873cb450 100644
--- a/src/NuGet.Clients/PackageManagement.UI/Xamls/PackageManagerControl.xaml
+++ b/src/NuGet.Clients/PackageManagement.UI/Xamls/PackageManagerControl.xaml
@@ -53,119 +53,16 @@
         FontSize="{Binding ElementName=_self,Path=FontSize,Converter={StaticResource Font155PercentSizeConverter}}"
         Margin="8,8">Package Manager</TextBlock>
 
-      <WrapPanel
+      <Tools:PackageManagerTopPanel
+        x:Name="_topPanel"
         Grid.Row="3"
-        Margin="0,12,0,20"
-        Orientation="Horizontal">
-        <StackPanel
-          Orientation="Horizontal"
-          Margin="24,8,0,0">
-          <TextBlock
-            Grid.Column="0"
-            VerticalAlignment="Center"
-            Text="{x:Static resx:Resources.Label_Repository}" />
-
-          <ComboBox
-            Margin="6,0,0,0"
-            x:Name="_sourceRepoList"
-            VerticalAlignment="Center"
-            DisplayMemberPath="PackageSource.Name"
-            MinWidth="130"
-            MinHeight="22"
-            Grid.Column="1"
-            AutomationProperties.Name="{x:Static resx:Resources.Label_Repository}"
-            SelectionChanged="SourceRepoList_SelectionChanged">
-            <ComboBox.ToolTip>
-              <ToolTip
-                x:Name="_sourceTooltip">
-                <TextBlock
-                  Text="{Binding}" />
-              </ToolTip>
-            </ComboBox.ToolTip>
-          </ComboBox>
-
-          <TextBlock
-            Grid.Column="2"
-            Margin="24,0,0,0"
-            VerticalAlignment="Center"
-            Text="{x:Static resx:Resources.Label_Filter}" />
-
-          <ComboBox
-            Grid.Column="3"
-            Margin="6,0,0,0"
-            VerticalAlignment="Center"
-            SelectedIndex="0"
-            x:Name="_filter"
-            MinWidth="130"
-            MinHeight="22"
-            AutomationProperties.Name="{x:Static resx:Resources.Label_Filter}"
-            SelectionChanged="Filter_SelectionChanged" />
-
-          <CheckBox
-            x:Name="_checkboxPrerelease"
-            Grid.Column="4"
-            Margin="24,0,0,0"
-            VerticalAlignment="Center"
-            Content="{x:Static resx:Resources.Checkbox_IncludePrerelease}"
-            Foreground="{DynamicResource {x:Static resx:Brushes.UIText}}"
-            VerticalContentAlignment="Center"
-            Checked="CheckboxPrerelease_CheckChanged"
-            Unchecked="CheckboxPrerelease_CheckChanged"
-            IsChecked="True" />
-        </StackPanel>
-
-        <StackPanel
-          Orientation="Horizontal"
-          Margin="24,8,0,0"
-          MinHeight="24">
-          <Border
-            Grid.Column="6"
-            VerticalAlignment="Center"
-            x:Name="_searchControlParent"
-            MinHeight="22"
-            MinWidth="224"
-            MaxWidth="224" />
-
-          <Button
-            Margin="24,0"
-            VerticalAlignment="Center"
-            Padding="0"
-            Grid.Column="7"
-            Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
-            Click="SettingsButtonClick"
-            x:Name="_settingsButton">
-            <Rectangle
-              Width="{Binding ElementName=_self,Path=FontSize,Converter={StaticResource Font122PercentSizeConverter}}"
-              Height="{Binding ElementName=_self,Path=FontSize,Converter={StaticResource Font122PercentSizeConverter}}">
-              <Rectangle.Fill>
-                <DrawingBrush>
-                  <DrawingBrush.Drawing>
-                    <DrawingGroup>
-                      <DrawingGroup.Children>
-                        <GeometryDrawing
-                          Brush="#00FFFFFF"
-                          Geometry="F1M16,16L0,16 0,0 16,0z" />
-                        <GeometryDrawing
-                          Brush="#FFF6F6F6"
-                          Geometry="F1M15.9434,7.0796L15.8734,6.4596 13.6374,5.6646 14.6544,3.5256 14.2684,3.0376C13.8854,2.5536,13.4464,2.1146,12.9644,1.7316L12.4754,1.3456 10.3354,2.3626 9.5414,0.1286 8.9224,0.057599999999999C8.6194,0.0215999999999994 8.3124,-0.000400000000000844 8.0004,-0.000400000000000844 7.6894,-0.000400000000000844 7.3824,0.0215999999999994 7.0804,0.0565999999999995L6.4614,0.126599999999999 5.6664,2.3626 3.5254,1.3456 3.0374,1.7316C2.5554,2.1126,2.1164,2.5516,1.7324,3.0366L1.3454,3.5246 2.3624,5.6646 0.1274,6.4596 0.0564,7.0796C0.0224000000000011,7.3816 0.000400000000000844,7.6876 0.000400000000000844,7.9996 0.000400000000000844,8.3116 0.0224000000000011,8.6186 0.0564,8.9206L0.1274,9.5396 2.3624,10.3346 1.3454,12.4746 1.7324,12.9626C2.1144,13.4466,2.5534,13.8846,3.0374,14.2676L3.5254,14.6556 5.6664,13.6376 6.4614,15.8726 7.0804,15.9436C7.3824,15.9786 7.6894,15.9996 8.0004,15.9996 8.3134,15.9996 8.6204,15.9786 8.9244,15.9426L9.5424,15.8706 10.3364,13.6366 12.4754,14.6556 12.9644,14.2676C13.4484,13.8836,13.8874,13.4446,14.2684,12.9616L14.6544,12.4736 13.6374,10.3346 15.8734,9.5396 15.9434,8.9206C15.9784,8.6186 16.0004,8.3116 16.0004,7.9996 16.0004,7.6876 15.9784,7.3816 15.9434,7.0796" />
-                        <GeometryDrawing
-                          Brush="#FF414141"
-                          Geometry="F1M8,5C6.343,5 5,6.343 5,8 5,9.657 6.343,11 8,11 9.657,11 11,9.657 11,8 11,6.343 9.657,5 8,5 M12.714,9.603C12.644,9.81,12.563,10.01,12.468,10.203L13.484,12.342C13.149,12.766,12.767,13.148,12.343,13.484L10.203,12.467C10.01,12.563,9.81,12.643,9.603,12.714L8.808,14.949C8.542,14.98 8.273,15 8,15 7.728,15 7.459,14.98 7.194,14.95L6.399,12.715C6.192,12.644,5.991,12.564,5.798,12.468L3.658,13.484C3.234,13.148,2.852,12.766,2.516,12.342L3.532,10.203C3.437,10.01,3.356,9.81,3.286,9.603L1.05,8.807C1.02,8.542 1,8.273 1,8 1,7.727 1.02,7.458 1.05,7.193L3.286,6.397C3.356,6.19,3.437,5.991,3.532,5.797L2.516,3.658C2.852,3.234,3.234,2.851,3.658,2.516L5.798,3.532C5.991,3.436,6.191,3.356,6.399,3.286L7.194,1.05C7.459,1.02 7.728,1 8,1 8.273,1 8.542,1.02 8.808,1.05L9.603,3.287C9.81,3.357,10.01,3.437,10.203,3.533L12.343,2.516C12.767,2.852,13.149,3.235,13.484,3.658L12.468,5.797C12.563,5.991,12.644,6.19,12.714,6.397L14.95,7.193C14.98,7.458 15,7.727 15,8 15,8.273 14.98,8.542 14.95,8.807z" />
-                        <GeometryDrawing
-                          Brush="#FF414141"
-                          Geometry="F1M9.5,8C9.5,8.828 8.829,9.5 8,9.5 7.171,9.5 6.5,8.828 6.5,8 6.5,7.172 7.171,6.5 8,6.5 8.829,6.5 9.5,7.172 9.5,8" />
-                        <GeometryDrawing
-                          Brush="#FFF0EFF1"
-                          Geometry="F1M8,9.5C7.172,9.5 6.5,8.828 6.5,8 6.5,7.172 7.172,6.5 8,6.5 8.828,6.5 9.5,7.172 9.5,8 9.5,8.828 8.828,9.5 8,9.5 M8,5C6.343,5 5,6.343 5,8 5,9.656 6.343,11 8,11 9.657,11 11,9.656 11,8 11,6.343 9.657,5 8,5" />
-                      </DrawingGroup.Children>
-                    </DrawingGroup>
-                  </DrawingBrush.Drawing>
-                </DrawingBrush>
-              </Rectangle.Fill>
-            </Rectangle>
-          </Button>
-        </StackPanel>
-      </WrapPanel>
+        Margin="24,0,24,17"
+        SettingsButtonClicked="SettingsButtonClicked"
+        FilterChanged="Filter_SelectionChanged"
+        PrereleaseCheckChanged="CheckboxPrerelease_CheckChanged"
+        SourceRepoListSelectionChanged="SourceRepoList_SelectionChanged"
+        />
+      
       <Border
         Grid.Row="4"
         BorderThickness="0,1,0,0"
diff --git a/src/NuGet.Clients/PackageManagement.UI/Xamls/PackageManagerControl.xaml.cs b/src/NuGet.Clients/PackageManagement.UI/Xamls/PackageManagerControl.xaml.cs
index 31b81c7d8ee..9937b964a90 100644
--- a/src/NuGet.Clients/PackageManagement.UI/Xamls/PackageManagerControl.xaml.cs
+++ b/src/NuGet.Clients/PackageManagement.UI/Xamls/PackageManagerControl.xaml.cs
@@ -72,7 +72,8 @@ public PackageManagerControl(
             _windowSearchHostFactory = searchFactory;
             if (_windowSearchHostFactory != null)
             {
-                _windowSearchHost = _windowSearchHostFactory.CreateWindowSearchHost(_searchControlParent);
+                _windowSearchHost = _windowSearchHostFactory.CreateWindowSearchHost(
+                    _topPanel.SearchControlParent);
                 _windowSearchHost.SetupSearch(this);
                 _windowSearchHost.IsVisible = true;
             }
@@ -95,6 +96,7 @@ public PackageManagerControl(
 
             // UI is initialized. Start the first search
             SearchPackageInActivePackageSource(_windowSearchHost.SearchQuery.SearchString);
+            RefreshAvailableUpdatesCount();
 
             // register with the UI controller
             var controller = model.UIController as NuGetUI;
@@ -117,26 +119,9 @@ public PackageManagerControl(
 
         private void InitializeFilterList(UserSettings settings)
         {
-            _filter.DisplayMemberPath = "Text";
-            var items = new[]
-                {
-                    new FilterItem(Filter.All, Resx.Resources.Filter_All),
-                    new FilterItem(Filter.Installed, Resx.Resources.Filter_Installed),
-                    new FilterItem(Filter.UpdatesAvailable, Resx.Resources.Filter_UpgradeAvailable)
-                };
-
-            foreach (var item in items)
-            {
-                _filter.Items.Add(item);
-            }
-
             if (settings != null)
             {
-                _filter.SelectedItem = items.First(item => item.Filter == settings.SelectedFilter);
-            }
-            else
-            {
-                _filter.SelectedItem = items[0];
+                _topPanel.SelectFilter(settings.SelectedFilter);
             }
         }
 
@@ -193,7 +178,7 @@ private void ApplySettings(
             _detailModel.Options.ShowPreviewWindow = settings.ShowPreviewWindow;
             _detailModel.Options.RemoveDependencies = settings.RemoveDependencies;
             _detailModel.Options.ForceRemove = settings.ForceRemove;
-            _checkboxPrerelease.IsChecked = settings.IncludePrerelease;
+            _topPanel.CheckboxPrerelease.IsChecked = settings.IncludePrerelease;
 
             SetSelectedDepencyBehavior(settings.DependencyBehavior);
 
@@ -218,14 +203,14 @@ private void Sources_PackageSourcesChanged(object sender, EventArgs e)
             _dontStartNewSearch = true;
             try
             {
-                var oldActiveSource = _sourceRepoList.SelectedItem as SourceRepository;
+                var oldActiveSource = _topPanel.SourceRepoList.SelectedItem as SourceRepository;
                 var newSources = GetEnabledSources();
 
                 // Update the source repo list with the new value.
-                _sourceRepoList.Items.Clear();
+                _topPanel.SourceRepoList.Items.Clear();
                 foreach (var source in newSources)
                 {
-                    _sourceRepoList.Items.Add(source);
+                    _topPanel.SourceRepoList.Items.Add(source);
                 }
 
                 SetNewActiveSource(newSources, oldActiveSource);
@@ -240,6 +225,7 @@ private void Sources_PackageSourcesChanged(object sender, EventArgs e)
                 {
                     SaveSettings();
                     SearchPackageInActivePackageSource(_windowSearchHost.SearchQuery.SearchString);
+                    RefreshAvailableUpdatesCount();
                 }
             }
             finally
@@ -285,13 +271,8 @@ public void SaveSettings()
             settings.ForceRemove = _detailModel.Options.ForceRemove;
             settings.DependencyBehavior = _detailModel.Options.SelectedDependencyBehavior.Behavior;
             settings.FileConflictAction = _detailModel.Options.SelectedFileConflictAction.Action;
-            settings.IncludePrerelease = _checkboxPrerelease.IsChecked == true;
-
-            var filterItem = _filter.SelectedItem as FilterItem;
-            if (filterItem != null)
-            {
-                settings.SelectedFilter = filterItem.Filter;
-            }
+            settings.IncludePrerelease = _topPanel.CheckboxPrerelease.IsChecked == true;
+            settings.SelectedFilter = _topPanel.Filter;
 
             Model.Context.AddSettings(GetSettingsKey(), settings);
         }
@@ -343,7 +324,7 @@ private void SetNewActiveSource(IEnumerable<SourceRepository> newSources, Source
                 }
             }
 
-            _sourceRepoList.SelectedItem = ActiveSource;
+            _topPanel.SourceRepoList.SelectedItem = ActiveSource;
             if (ActiveSource != null)
             {
                 Model.Context.SourceProvider.PackageSourceProvider.SaveActivePackageSource(ActiveSource.PackageSource);
@@ -458,11 +439,11 @@ private void SetTitle()
         private void InitSourceRepoList(UserSettings settings)
         {
             // init source repo list
-            _sourceRepoList.Items.Clear();
+            _topPanel.SourceRepoList.Items.Clear();
             var enabledSources = GetEnabledSources();
             foreach (var source in enabledSources)
             {
-                _sourceRepoList.Items.Add(source);
+                _topPanel.SourceRepoList.Items.Add(source);
             }
 
             // get active source name.
@@ -493,7 +474,7 @@ private void InitSourceRepoList(UserSettings settings)
 
             if (ActiveSource != null)
             {
-                _sourceRepoList.SelectedItem = ActiveSource;
+                _topPanel.SourceRepoList.SelectedItem = ActiveSource;
             }
         }
 
@@ -501,8 +482,7 @@ private bool ShowInstalled
         {
             get
             {
-                var filterItem = _filter.SelectedItem as FilterItem;
-                return filterItem != null && filterItem.Filter == Filter.Installed;
+                return _topPanel.Filter == Filter.Installed;
             }
         }
 
@@ -510,14 +490,13 @@ private bool ShowUpdatesAvailable
         {
             get
             {
-                var filterItem = _filter.SelectedItem as FilterItem;
-                return filterItem != null && filterItem.Filter == Filter.UpdatesAvailable;
+                return _topPanel.Filter == Filter.UpdatesAvailable;
             }
         }
 
         public bool IncludePrerelease
         {
-            get { return _checkboxPrerelease.IsChecked == true; }
+            get { return _topPanel.CheckboxPrerelease.IsChecked == true; }
         }
 
         internal SourceRepository ActiveSource { get; private set; }
@@ -529,12 +508,7 @@ private void SearchPackageInActivePackageSource(string searchText)
         {
             NuGetUIThreadHelper.JoinableTaskFactory.RunAsync(async delegate
                 {
-                    var filterItem = _filter.SelectedItem as FilterItem;
-                    var filter = filterItem != null ?
-                        filterItem.Filter :
-                        Filter.All;
-
-                    var option = new PackageLoaderOption(filter, IncludePrerelease);
+                    var option = new PackageLoaderOption(_topPanel.Filter, IncludePrerelease);
                     var loader = new PackageLoader(
                         option,
                         Model.Context.PackageManager,
@@ -546,7 +520,24 @@ private void SearchPackageInActivePackageSource(string searchText)
                 });
         }
 
-        private void SettingsButtonClick(object sender, RoutedEventArgs e)
+        private void RefreshAvailableUpdatesCount()
+        {
+            NuGetUIThreadHelper.JoinableTaskFactory.RunAsync(async delegate
+            {
+                _topPanel._labelUpgradeAvailable.Count = 0;
+                var updatesLoader = new PackageLoader(
+                    new PackageLoaderOption(Filter.UpdatesAvailable, IncludePrerelease),
+                    Model.Context.PackageManager,
+                    Model.Context.Projects,
+                    ActiveSource,
+                    String.Empty);
+                await updatesLoader.InitializeAsync();
+                int updatesCount = await updatesLoader.CreatePackagesWithUpdatesAsync(CancellationToken.None);
+                _topPanel._labelUpgradeAvailable.Count = updatesCount;
+            });
+        }
+
+        private void SettingsButtonClicked(object sender, EventArgs e)
         {
             Model.UIController.LaunchNuGetOptionsDialog();
         }
@@ -570,9 +561,9 @@ private async Task UpdateDetailPaneAsync()
             else
             {
                 _packageDetail.Visibility = Visibility.Visible;
-                var selectedFilter = _filter.SelectedItem as FilterItem;
-                await _detailModel.SetCurrentPackage(selectedPackage,
-                                                     selectedFilter == null ? Filter.All : selectedFilter.Filter);
+                await _detailModel.SetCurrentPackage(
+                    selectedPackage,
+                    _topPanel.Filter);
 
                 _packageDetail.DataContext = _detailModel;
                 _packageDetail.ScrollToHome();
@@ -601,26 +592,27 @@ private static string GetPackageSourceTooltip(Configuration.PackageSource packag
                 packageSource.Source);
         }
 
-        private void SourceRepoList_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void SourceRepoList_SelectionChanged(object sender, EventArgs e)
         {
             if (_dontStartNewSearch || !_initialized)
             {
                 return;
             }
 
-            ActiveSource = _sourceRepoList.SelectedItem as SourceRepository;
+            ActiveSource = _topPanel.SourceRepoList.SelectedItem as SourceRepository;
             if (ActiveSource != null)
             {
-                _sourceTooltip.Visibility = Visibility.Visible;
-                _sourceTooltip.DataContext = GetPackageSourceTooltip(ActiveSource.PackageSource);
+                _topPanel.SourceToolTip.Visibility = Visibility.Visible;
+                _topPanel.SourceToolTip.DataContext = GetPackageSourceTooltip(ActiveSource.PackageSource);
 
                 Model.Context.SourceProvider.PackageSourceProvider.SaveActivePackageSource(ActiveSource.PackageSource);
                 SaveSettings();
                 SearchPackageInActivePackageSource(_windowSearchHost.SearchQuery.SearchString);
+                RefreshAvailableUpdatesCount();
             }
         }
 
-        private void Filter_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        private void Filter_SelectionChanged(object sender, EventArgs e)
         {
             if (_initialized)
             {
@@ -649,12 +641,14 @@ internal void UpdatePackageStatus()
                         continue;
                     }
 
-                    package.StatusProvider = new Lazy<Task<PackageStatus>>(async () => await GetPackageStatus(
+                    package.StatusProvider = new Lazy<Task<PackageStatus>>(async () => await GetPackageInfo(
                        package.Id,
                        installedPackages,
                        package.Versions));
                 }
             }
+
+            RefreshAvailableUpdatesCount();
         }
 
         private static IReadOnlyList<Packaging.PackageReference> GetInstalledPackages(IEnumerable<NuGetProject> projects)
@@ -681,7 +675,7 @@ internal void UpdatePackageStatus()
         /// <param name="installedPackages">All installed pacakges.</param>
         /// <param name="allVersions">List of all versions of the package.</param>
         /// <returns>The status of the package in the installation target.</returns>
-        private static async Task<PackageStatus> GetPackageStatus(
+        private static async Task<PackageStatus> GetPackageInfo(
             string packageId,
             IReadOnlyList<Packaging.PackageReference> installedPackages,
             Lazy<Task<IEnumerable<VersionInfo>>> allVersions)
@@ -699,24 +693,24 @@ private static async Task<PackageStatus> GetPackageStatus(
                 .OrderBy(r => r.PackageIdentity.Version)
                 .FirstOrDefault();
 
-            PackageStatus status;
+            PackageStatus result;
             if (minimumInstalledPackage != null)
             {
                 if (minimumInstalledPackage.PackageIdentity.Version < latestStableVersion)
                 {
-                    status = PackageStatus.UpdateAvailable;
+                    result = PackageStatus.UpdateAvailable;
                 }
                 else
                 {
-                    status = PackageStatus.Installed;
+                    result = PackageStatus.Installed;
                 }
             }
             else
             {
-                status = PackageStatus.NotInstalled;
+                result = PackageStatus.NotInstalled;
             }
 
-            return status;
+            return result;
         }
 
         private void SearchControl_SearchStart(object sender, EventArgs e)
@@ -729,15 +723,18 @@ private void SearchControl_SearchStart(object sender, EventArgs e)
             SearchPackageInActivePackageSource(_windowSearchHost.SearchQuery.SearchString);
         }
 
-        private void CheckboxPrerelease_CheckChanged(object sender, RoutedEventArgs e)
+        private void CheckboxPrerelease_CheckChanged(object sender, EventArgs e)
         {
             if (!_initialized)
             {
                 return;
             }
 
-            RegistrySettingUtility.SetBooleanSetting(Constants.IncludePrereleaseRegistryName, _checkboxPrerelease.IsChecked == true);
+            RegistrySettingUtility.SetBooleanSetting(
+                Constants.IncludePrereleaseRegistryName, 
+                _topPanel.CheckboxPrerelease.IsChecked == true);
             SearchPackageInActivePackageSource(_windowSearchHost.SearchQuery.SearchString);
+            RefreshAvailableUpdatesCount();
         }
 
         internal class SearchQuery : IVsSearchQuery
@@ -783,7 +780,7 @@ public void ProvideSearchSettings(IVsUIDataSource pSearchSettings)
             // so that the code can be run on both dev12 & dev14. If we use the type directly,
             // there will be type mismatch error.
             dynamic settings = pSearchSettings;
-            settings.ControlMinWidth = (uint)_searchControlParent.MinWidth;
+            settings.ControlMinWidth = (uint)_topPanel.SearchControlParent.MinWidth;
             settings.ControlMaxWidth = uint.MaxValue;
             settings.SearchWatermark = GetSearchText();
         }
diff --git a/src/NuGet.Clients/PackageManagement.UI/Xamls/PackageManagerTopPanel.xaml b/src/NuGet.Clients/PackageManagement.UI/Xamls/PackageManagerTopPanel.xaml
new file mode 100644
index 00000000000..8f5bfb7f9a7
--- /dev/null
+++ b/src/NuGet.Clients/PackageManagement.UI/Xamls/PackageManagerTopPanel.xaml
@@ -0,0 +1,155 @@
+<UserControl x:Class="NuGet.PackageManagement.UI.PackageManagerTopPanel"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="clr-namespace:NuGet.PackageManagement.UI"
+             xmlns:resx="clr-namespace:NuGet.PackageManagement.UI"
+             x:Name="_self"
+             mc:Ignorable="d"
+             d:DesignHeight="100" d:DesignWidth="600">
+  <UserControl.Resources>
+    <ResourceDictionary>
+      <ResourceDictionary.MergedDictionaries>
+        <ResourceDictionary
+          Source="Resources.xaml" />
+      </ResourceDictionary.MergedDictionaries>
+    </ResourceDictionary>
+  </UserControl.Resources>
+  <Grid>
+    <Grid.RowDefinitions>
+      <RowDefinition Height="auto" />
+      <RowDefinition Height="14" />
+      <RowDefinition Height="auto" />
+    </Grid.RowDefinitions>
+
+    <Grid Grid.Row="0">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="auto" />
+        <ColumnDefinition Width="auto" />
+        <ColumnDefinition Width="auto" />
+        <ColumnDefinition Width="*" MinWidth="20" />
+        <ColumnDefinition Width="auto" />
+        <ColumnDefinition Width="auto" />
+        <ColumnDefinition Width="auto" />
+        <ColumnDefinition Width="auto" />
+      </Grid.ColumnDefinitions>
+
+      <local:FilterLabel 
+        Grid.Column="0"
+        x:Name="_labelBrowse"
+        Filter="All"
+        Text="{x:Static resx:Resources.Label_Browse}"
+        ControlSelected="FilterLabel_ControlSelected"
+        />      
+      <local:FilterLabel 
+        Grid.Column="1"
+        x:Name="_labelInstalled"
+        Filter="Installed"
+        Margin="35,0,0,0"
+        Text="{x:Static resx:Resources.Label_Installed}"
+        ControlSelected="FilterLabel_ControlSelected">
+      </local:FilterLabel>
+      <local:FilterLabel 
+        Grid.Column="2"
+        x:Name="_labelUpgradeAvailable"
+        Filter="UpdatesAvailable"
+        Margin="35,0,0,0"
+        Text="{x:Static resx:Resources.Label_Updates}"
+        ControlSelected="FilterLabel_ControlSelected">
+      </local:FilterLabel>
+
+      <TextBlock
+        Grid.Column="4"
+        VerticalAlignment="Center"
+        Text="{x:Static resx:Resources.Label_Repository}" />
+      <ComboBox
+        Grid.Column="6"
+        Margin="6,0,0,0"
+        x:Name="_sourceRepoList"
+        VerticalAlignment="Center"
+        DisplayMemberPath="PackageSource.Name"
+        MinWidth="130"
+        MinHeight="22"
+        AutomationProperties.Name="{x:Static resx:Resources.Label_Repository}"
+        SelectionChanged="_sourceRepoList_SelectionChanged">
+        <ComboBox.ToolTip>
+          <ToolTip
+                x:Name="_sourceTooltip">
+            <TextBlock
+                  Text="{Binding}" />
+          </ToolTip>
+        </ComboBox.ToolTip>
+      </ComboBox>
+
+      <Button
+        Grid.Column="7"
+        Margin="12,0,0,0"
+        VerticalAlignment="Center"
+        Padding="0"
+        Style="{StaticResource {x:Static ToolBar.ButtonStyleKey}}"
+        Click="_settingsButton_Click"
+        x:Name="_settingsButton">
+        <Rectangle
+          Width="{Binding ElementName=_self,Path=FontSize,Converter={StaticResource Font122PercentSizeConverter}}"
+          Height="{Binding ElementName=_self,Path=FontSize,Converter={StaticResource Font122PercentSizeConverter}}">
+          <Rectangle.Fill>
+            <DrawingBrush>
+              <DrawingBrush.Drawing>
+                <DrawingGroup>
+                  <DrawingGroup.Children>
+                    <GeometryDrawing
+                          Brush="#00FFFFFF"
+                          Geometry="F1M16,16L0,16 0,0 16,0z" />
+                    <GeometryDrawing
+                          Brush="#FFF6F6F6"
+                          Geometry="F1M15.9434,7.0796L15.8734,6.4596 13.6374,5.6646 14.6544,3.5256 14.2684,3.0376C13.8854,2.5536,13.4464,2.1146,12.9644,1.7316L12.4754,1.3456 10.3354,2.3626 9.5414,0.1286 8.9224,0.057599999999999C8.6194,0.0215999999999994 8.3124,-0.000400000000000844 8.0004,-0.000400000000000844 7.6894,-0.000400000000000844 7.3824,0.0215999999999994 7.0804,0.0565999999999995L6.4614,0.126599999999999 5.6664,2.3626 3.5254,1.3456 3.0374,1.7316C2.5554,2.1126,2.1164,2.5516,1.7324,3.0366L1.3454,3.5246 2.3624,5.6646 0.1274,6.4596 0.0564,7.0796C0.0224000000000011,7.3816 0.000400000000000844,7.6876 0.000400000000000844,7.9996 0.000400000000000844,8.3116 0.0224000000000011,8.6186 0.0564,8.9206L0.1274,9.5396 2.3624,10.3346 1.3454,12.4746 1.7324,12.9626C2.1144,13.4466,2.5534,13.8846,3.0374,14.2676L3.5254,14.6556 5.6664,13.6376 6.4614,15.8726 7.0804,15.9436C7.3824,15.9786 7.6894,15.9996 8.0004,15.9996 8.3134,15.9996 8.6204,15.9786 8.9244,15.9426L9.5424,15.8706 10.3364,13.6366 12.4754,14.6556 12.9644,14.2676C13.4484,13.8836,13.8874,13.4446,14.2684,12.9616L14.6544,12.4736 13.6374,10.3346 15.8734,9.5396 15.9434,8.9206C15.9784,8.6186 16.0004,8.3116 16.0004,7.9996 16.0004,7.6876 15.9784,7.3816 15.9434,7.0796" />
+                    <GeometryDrawing
+                          Brush="#FF414141"
+                          Geometry="F1M8,5C6.343,5 5,6.343 5,8 5,9.657 6.343,11 8,11 9.657,11 11,9.657 11,8 11,6.343 9.657,5 8,5 M12.714,9.603C12.644,9.81,12.563,10.01,12.468,10.203L13.484,12.342C13.149,12.766,12.767,13.148,12.343,13.484L10.203,12.467C10.01,12.563,9.81,12.643,9.603,12.714L8.808,14.949C8.542,14.98 8.273,15 8,15 7.728,15 7.459,14.98 7.194,14.95L6.399,12.715C6.192,12.644,5.991,12.564,5.798,12.468L3.658,13.484C3.234,13.148,2.852,12.766,2.516,12.342L3.532,10.203C3.437,10.01,3.356,9.81,3.286,9.603L1.05,8.807C1.02,8.542 1,8.273 1,8 1,7.727 1.02,7.458 1.05,7.193L3.286,6.397C3.356,6.19,3.437,5.991,3.532,5.797L2.516,3.658C2.852,3.234,3.234,2.851,3.658,2.516L5.798,3.532C5.991,3.436,6.191,3.356,6.399,3.286L7.194,1.05C7.459,1.02 7.728,1 8,1 8.273,1 8.542,1.02 8.808,1.05L9.603,3.287C9.81,3.357,10.01,3.437,10.203,3.533L12.343,2.516C12.767,2.852,13.149,3.235,13.484,3.658L12.468,5.797C12.563,5.991,12.644,6.19,12.714,6.397L14.95,7.193C14.98,7.458 15,7.727 15,8 15,8.273 14.98,8.542 14.95,8.807z" />
+                    <GeometryDrawing
+                          Brush="#FF414141"
+                          Geometry="F1M9.5,8C9.5,8.828 8.829,9.5 8,9.5 7.171,9.5 6.5,8.828 6.5,8 6.5,7.172 7.171,6.5 8,6.5 8.829,6.5 9.5,7.172 9.5,8" />
+                    <GeometryDrawing
+                          Brush="#FFF0EFF1"
+                          Geometry="F1M8,9.5C7.172,9.5 6.5,8.828 6.5,8 6.5,7.172 7.172,6.5 8,6.5 8.828,6.5 9.5,7.172 9.5,8 9.5,8.828 8.828,9.5 8,9.5 M8,5C6.343,5 5,6.343 5,8 5,9.656 6.343,11 8,11 9.657,11 11,9.656 11,8 11,6.343 9.657,5 8,5" />
+                  </DrawingGroup.Children>
+                </DrawingGroup>
+              </DrawingBrush.Drawing>
+            </DrawingBrush>
+          </Rectangle.Fill>
+        </Rectangle>
+      </Button>
+    </Grid>
+
+    <!-- search control and include prerelease checkbox -->
+    <Grid Grid.Row="2">
+      <Grid.ColumnDefinitions>
+        <ColumnDefinition Width="auto" />
+        <ColumnDefinition Width="auto"/>
+      </Grid.ColumnDefinitions>
+
+      <!-- container of the search control -->
+      <Border
+        Grid.Column="0"
+        VerticalAlignment="Center"
+        x:Name="_searchControlParent"
+        Width="320"
+        MinHeight="22"
+        MinWidth="224" />
+
+      <!-- prerelease checkbox -->
+      <CheckBox
+        x:Name="_checkboxPrerelease"
+        Grid.Column="1"
+        Margin="6,0,0,0"
+        VerticalAlignment="Center"
+        Content="{x:Static resx:Resources.Checkbox_IncludePrerelease}"
+        Foreground="{DynamicResource {x:Static resx:Brushes.UIText}}"
+        VerticalContentAlignment="Center"
+        Checked="_checkboxPrerelease_Checked"
+        Unchecked="_checkboxPrerelease_Unchecked"
+        IsChecked="True" />
+    </Grid>
+  </Grid>
+</UserControl>
\ No newline at end of file
diff --git a/src/NuGet.Clients/PackageManagement.UI/Xamls/PackageManagerTopPanel.xaml.cs b/src/NuGet.Clients/PackageManagement.UI/Xamls/PackageManagerTopPanel.xaml.cs
new file mode 100644
index 00000000000..e2cd81286c5
--- /dev/null
+++ b/src/NuGet.Clients/PackageManagement.UI/Xamls/PackageManagerTopPanel.xaml.cs
@@ -0,0 +1,151 @@
+using System;
+using System.Diagnostics.CodeAnalysis;
+using System.Windows;
+using System.Windows.Controls;
+
+namespace NuGet.PackageManagement.UI
+{
+    /// <summary>
+    /// The panel which is located at the top of the package manager window.
+    /// </summary>
+    public partial class PackageManagerTopPanel : UserControl
+    {
+        private FilterLabel _selectedFilter;
+
+        public PackageManagerTopPanel()
+        {
+            InitializeComponent();            
+
+            _labelBrowse.Selected = true;
+            _selectedFilter = _labelBrowse;
+        }
+
+        // the control that is used as container for the search box.
+        public Border SearchControlParent
+        {
+            get
+            {
+                return _searchControlParent;
+            }
+        }
+
+        public CheckBox CheckboxPrerelease
+        {
+            get
+            {
+                return _checkboxPrerelease;
+            }
+        }
+
+        public ComboBox SourceRepoList
+        {
+            get
+            {
+                return _sourceRepoList;
+            }
+        }
+
+        public ToolTip SourceToolTip
+        {
+            get
+            {
+                return _sourceTooltip;
+            }
+        }
+
+        public Filter Filter
+        {
+            get
+            {
+                return _selectedFilter.Filter;
+            }
+        }
+
+        private void _checkboxPrerelease_Checked(object sender, RoutedEventArgs e)
+        {
+            if (PrereleaseCheckChanged != null)
+            {
+                PrereleaseCheckChanged(this, EventArgs.Empty);
+            }
+        }
+
+        private void _checkboxPrerelease_Unchecked(object sender, RoutedEventArgs e)
+        {
+            if (PrereleaseCheckChanged != null)
+            {
+                PrereleaseCheckChanged(this, EventArgs.Empty);
+            }
+        }
+
+        private void _sourceRepoList_SelectionChanged(object sender, SelectionChangedEventArgs e)
+        {
+            if (SourceRepoListSelectionChanged != null)
+            {
+                SourceRepoListSelectionChanged(this, EventArgs.Empty);
+            }
+        }
+
+        private void _settingsButton_Click(object sender, RoutedEventArgs e)
+        {
+            if (SettingsButtonClicked != null)
+            {
+                SettingsButtonClicked(this, EventArgs.Empty);
+            }
+        }
+
+        [SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode",
+            Justification = "It is referenced by the xaml file")]
+        private void FilterLabel_ControlSelected(object sender, EventArgs e)
+        {
+            var selectedFilter = (FilterLabel)sender;
+            if (selectedFilter == _selectedFilter)
+            {
+                return;
+            }
+
+            if (_selectedFilter != null)
+            {
+                _selectedFilter.Selected = false;
+            }
+
+            _selectedFilter = selectedFilter;
+            if (FilterChanged != null)
+            {
+                FilterChanged(this, EventArgs.Empty);
+            }
+        }
+
+        public event EventHandler<EventArgs> FilterChanged;
+
+        public event EventHandler<EventArgs> SettingsButtonClicked;
+
+        public event EventHandler<EventArgs> PrereleaseCheckChanged;
+
+        public event EventHandler<EventArgs> SourceRepoListSelectionChanged;
+
+        public void SelectFilter(Filter selectedFilter)
+        {
+            if (_selectedFilter != null)
+            {
+                _selectedFilter.Selected = false;
+            }
+
+            switch (selectedFilter)
+            {
+                case Filter.All:
+                    _selectedFilter = _labelBrowse;
+                    break;
+
+                case Filter.Installed:
+                    _selectedFilter = _labelInstalled;
+                    break;
+
+                case Filter.UpdatesAvailable:
+                    _selectedFilter = _labelUpgradeAvailable;
+                    break;
+            }
+
+            _selectedFilter.Selected = true;
+        }
+    }
+}
\ No newline at end of file