diff --git a/build/packages.targets b/build/packages.targets
index 61b2c47817a..d8c79c8fb74 100644
--- a/build/packages.targets
+++ b/build/packages.targets
@@ -5,7 +5,7 @@
         <MicrosoftWebXdtPackageVersion Condition="'$(MicrosoftWebXdtPackageVersion)' == ''">3.0.0</MicrosoftWebXdtPackageVersion>
         <SystemComponentModelCompositionPackageVersion Condition="'$(SystemComponentModelCompositionPackageVersion)' == ''">4.5.0</SystemComponentModelCompositionPackageVersion>
         <SystemPackagesVersion>4.3.0</SystemPackagesVersion>
-        <VSFrameworkVersion>17.1.0-preview-2-31918-073</VSFrameworkVersion>
+        <VSFrameworkVersion>17.2.0-preview-2-32304-091</VSFrameworkVersion>
         <VSServicesVersion>16.153.0</VSServicesVersion>
         <CryptographyPackagesVersion>5.0.0</CryptographyPackagesVersion>
         <NuGetCoreV2Version>2.14.0-rtm-832</NuGetCoreV2Version>
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/NuGet.PackageManagement.UI.csproj b/src/NuGet.Clients/NuGet.PackageManagement.UI/NuGet.PackageManagement.UI.csproj
index 00432d89027..92a27e78600 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/NuGet.PackageManagement.UI.csproj
+++ b/src/NuGet.Clients/NuGet.PackageManagement.UI/NuGet.PackageManagement.UI.csproj
@@ -217,7 +217,6 @@
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
     <Compile Include="Resources\Images.cs" />
-    <Compile Include="Resources\Styles.cs" />
     <Compile Include="UserInterfaceService\INuGetUI.cs" />
     <Compile Include="Models\PackageLicenseInfo.cs" />
     <Compile Include="Models\DetailedPackageMetadata.cs" />
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/Options/PackageSourceCheckedListBox.cs b/src/NuGet.Clients/NuGet.PackageManagement.UI/Options/PackageSourceCheckedListBox.cs
index 3ed875d0ea5..82e0f17d23b 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/Options/PackageSourceCheckedListBox.cs
+++ b/src/NuGet.Clients/NuGet.PackageManagement.UI/Options/PackageSourceCheckedListBox.cs
@@ -13,6 +13,7 @@
 using NuGet.VisualStudio.Internal.Contracts;
 using GelUtilities = Microsoft.Internal.VisualStudio.PlatformUI.Utilities;
 using NuGet.Configuration;
+using Microsoft.VisualStudio.Shell;
 
 namespace NuGet.Options
 {
@@ -24,6 +25,8 @@ internal class PackageSourceCheckedListBox : CheckedListBox
 
         private Icon GetWarningIcon()
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
+
             if (WarningIcon == null)
             {
                 ImageAttributes attributes = new ImageAttributes
@@ -66,6 +69,8 @@ public override int ItemHeight
 
         protected override void OnDrawItem(DrawItemEventArgs e)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
+
             var currentListBox = this;
             var graphics = e.Graphics;
             e.DrawBackground();
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/Options/PackageSourcesOptionsControl.cs b/src/NuGet.Clients/NuGet.PackageManagement.UI/Options/PackageSourcesOptionsControl.cs
index 2ff713f6353..7502c7dd501 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/Options/PackageSourcesOptionsControl.cs
+++ b/src/NuGet.Clients/NuGet.PackageManagement.UI/Options/PackageSourcesOptionsControl.cs
@@ -54,6 +54,7 @@ private static IVsImageService2 ImageService
         {
             get
             {
+                ThreadHelper.ThrowIfNotOnUIThread();
                 return (IVsImageService2)Package.GetGlobalService(typeof(SVsImageService));
             }
         }
@@ -62,6 +63,8 @@ public static Image WarningIcon
         {
             get
             {
+                ThreadHelper.ThrowIfNotOnUIThread();
+
                 ImageAttributes attributes = new ImageAttributes
                 {
                     StructSize = Marshal.SizeOf(typeof(ImageAttributes)),
@@ -80,6 +83,8 @@ public static Image WarningIcon
 
         public PackageSourcesOptionsControl(IAsyncServiceProvider asyncServiceProvider)
         {
+            ThreadHelper.ThrowIfNotOnUIThread();
+
             InitializeComponent();
 
             _asyncServiceProvider = asyncServiceProvider;
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/Resources/Resources.xaml b/src/NuGet.Clients/NuGet.PackageManagement.UI/Resources/Resources.xaml
index 6d7bfa79225..8e3a243c7c8 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/Resources/Resources.xaml
+++ b/src/NuGet.Clients/NuGet.PackageManagement.UI/Resources/Resources.xaml
@@ -165,17 +165,17 @@
     <Setter Property="FocusVisualStyle" Value="{StaticResource GridSplitterFocusVisualStyle}"/>
   </Style>
 
-  <Style x:Key="{x:Type ComboBox}" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Static nuget:Styles.ThemedComboStyleKey}}">
+  <Style x:Key="{x:Type ComboBox}" TargetType="{x:Type ComboBox}" BasedOn="{StaticResource {x:Static vs:VsResourceKeys.ComboBoxStyleKey}}">
     <Setter Property="FocusVisualStyle" Value="{StaticResource ControlsFocusVisualStyle}"/>
   </Style>
 
-  <Style x:Key="{x:Type ComboBoxItem}" TargetType="{x:Type ComboBoxItem}" BasedOn="{StaticResource {x:Type ComboBoxItem}}">
+  <Style x:Key="{x:Type ComboBoxItem}" TargetType="{x:Type ComboBoxItem}" BasedOn="{StaticResource {x:Static vs:VsResourceKeys.ComboBoxItemStyleKey}}">
     <Setter Property="FocusVisualStyle" Value="{StaticResource ControlsFocusVisualStyle}"/>
   </Style>
 
-  <Style x:Key="{x:Type ScrollBar}" TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource {x:Static nuget:Styles.ScrollBarStyleKey}}"/>
+  <Style x:Key="{x:Type ScrollBar}" TargetType="{x:Type ScrollBar}" BasedOn="{StaticResource {x:Static vs:VsResourceKeys.ScrollBarStyleKey}}"/>
 
-  <Style x:Key="{x:Type ScrollViewer}" TargetType="{x:Type ScrollViewer}" BasedOn="{StaticResource {x:Static nuget:Styles.ScrollViewerStyleKey}}"/>
+  <Style x:Key="{x:Type ScrollViewer}" TargetType="{x:Type ScrollViewer}" BasedOn="{StaticResource {x:Static vs:VsResourceKeys.ScrollViewerStyleKey}}"/>
 
   <Style x:Key="TooltipStyle" TargetType="{x:Type TextBlock}">
     <Setter Property="TextWrapping" Value="Wrap" />
@@ -556,52 +556,6 @@
     </Setter>
   </Style>
 
-  <Style TargetType="{x:Type ComboBoxItem}" x:Key="ComboBoxItemStyle">
-    <Setter Property="Foreground" Value="{DynamicResource {x:Static nuget:Brushes.UIText}}"/>
-    <Setter Property="FocusVisualStyle" Value="{StaticResource ControlsFocusVisualStyle}"/>
-    <Setter Property="Template">
-      <Setter.Value>
-        <ControlTemplate TargetType="{x:Type ComboBoxItem}">
-          <Border x:Name="Bd"
-                    SnapsToDevicePixels="true"
-                    Background="{TemplateBinding Background}"
-                    BorderBrush="{TemplateBinding BorderBrush}"
-                    BorderThickness="{TemplateBinding BorderThickness}"
-                    Padding="{TemplateBinding Padding}">
-            <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
-                                VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
-                                SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" />
-          </Border>
-          <ControlTemplate.Triggers>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="IsMouseOver" Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Background" TargetName="Bd" Value="{DynamicResource {x:Static nuget:Brushes.ContentMouseOverBrushKey}}" />
-              <Setter Property="TextBlock.Foreground" Value="{DynamicResource {x:Static nuget:Brushes.ContentMouseOverTextBrushKey}}" />
-            </MultiTrigger>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="Selector.IsSelectionActive" Value="False" />
-                <Condition Property="IsSelected" Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Background" TargetName="Bd" Value="{DynamicResource {x:Static nuget:Brushes.ContentInactiveSelectedBrushKey}}" />
-              <Setter Property="TextBlock.Foreground" Value="{DynamicResource {x:Static nuget:Brushes.ContentInactiveSelectedTextBrushKey}}" />
-            </MultiTrigger>
-            <MultiTrigger>
-              <MultiTrigger.Conditions>
-                <Condition Property="Selector.IsSelectionActive" Value="True" />
-                <Condition Property="IsSelected" Value="True" />
-              </MultiTrigger.Conditions>
-              <Setter Property="Background" TargetName="Bd" Value="{DynamicResource {x:Static nuget:Brushes.ContentSelectedBrushKey}}" />
-              <Setter Property="TextBlock.Foreground" TargetName="Bd" Value="{DynamicResource {x:Static nuget:Brushes.ContentSelectedTextBrushKey}}" />
-            </MultiTrigger>
-          </ControlTemplate.Triggers>
-        </ControlTemplate>
-      </Setter.Value>
-    </Setter>
-  </Style>
-
   <!-- In order to create a TextBlock like element, but with selectable text use:
     <TextBox Style="{DynamicResource SelectableTextBlockStyle}" />
 
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/Resources/Styles.cs b/src/NuGet.Clients/NuGet.PackageManagement.UI/Resources/Styles.cs
deleted file mode 100644
index 5209f8578cc..00000000000
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/Resources/Styles.cs
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System.ComponentModel;
-using System.Windows.Controls;
-using System.Windows.Controls.Primitives;
-using Microsoft.VisualStudio.Shell;
-
-namespace NuGet.PackageManagement.UI
-{
-    public static class Styles
-    {
-        [Browsable(false)]
-        public static object ThemedComboStyleKey => VsResourceKeys.ThemedDialogComboBoxStyleKey ?? typeof(ComboBox);
-
-        [Browsable(false)]
-        public static object ScrollBarStyleKey => VsResourceKeys.ScrollBarStyleKey ?? typeof(ScrollBar);
-
-        [Browsable(false)]
-        public static object ScrollViewerStyleKey => VsResourceKeys.ScrollViewerStyleKey ?? typeof(ScrollViewer);
-    }
-}
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PackageManagerTopPanel.xaml b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PackageManagerTopPanel.xaml
index 664f1f86c0f..7d686f03b1d 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PackageManagerTopPanel.xaml
+++ b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/PackageManagerTopPanel.xaml
@@ -276,7 +276,7 @@
             </ToolTip>
           </ComboBox.ToolTip>
           <ComboBox.ItemContainerStyle>
-            <Style TargetType="{x:Type ComboBoxItem}" BasedOn="{StaticResource ComboBoxItemStyle}">
+            <Style TargetType="{x:Type ComboBoxItem}" BasedOn="{StaticResource {x:Type ComboBoxItem}}">
               <Setter Property="AutomationProperties.Name" Value="{Binding SourceName}"/>
             </Style>
           </ComboBox.ItemContainerStyle>
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/ProjectView.xaml b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/ProjectView.xaml
index a2b14c0e0c6..7645a7ed2d9 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/ProjectView.xaml
+++ b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/ProjectView.xaml
@@ -109,7 +109,7 @@
       SelectionChanged="Versions_SelectionChanged"
       SelectedItem="{Binding Path=SelectedVersion, Mode=TwoWay}">
       <ComboBox.ItemContainerStyle>
-            <Style TargetType="{x:Type ComboBoxItem}" BasedOn="{StaticResource ComboBoxItemStyle}">
+            <Style TargetType="{x:Type ComboBoxItem}" BasedOn="{StaticResource {x:Type ComboBoxItem}}">
                 <Setter Property="Foreground" Value="{DynamicResource {x:Static local:Brushes.UIText}}" />
                 <Style.Triggers>
                     <DataTrigger Binding="{Binding Path=IsValidVersion}" Value="false">
diff --git a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/SolutionView.xaml b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/SolutionView.xaml
index baffdb1a30e..a8b071c98a8 100644
--- a/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/SolutionView.xaml
+++ b/src/NuGet.Clients/NuGet.PackageManagement.UI/Xamls/SolutionView.xaml
@@ -399,7 +399,7 @@
         SelectedItem="{Binding Path=SelectedVersion}">
 
         <ComboBox.ItemContainerStyle>
-          <Style TargetType="{x:Type ComboBoxItem}" BasedOn="{StaticResource ComboBoxItemStyle}">
+          <Style TargetType="{x:Type ComboBoxItem}" BasedOn="{StaticResource {x:Type ComboBoxItem}}">
             <Style.Triggers>
               <DataTrigger 
                         Binding="{Binding Converter={StaticResource NotNullToBooleanConverter}}"
diff --git a/src/NuGet.Clients/NuGet.VisualStudio.Client/.vsixignore b/src/NuGet.Clients/NuGet.VisualStudio.Client/.vsixignore
index 5928ae03158..e91ca790429 100644
--- a/src/NuGet.Clients/NuGet.VisualStudio.Client/.vsixignore
+++ b/src/NuGet.Clients/NuGet.VisualStudio.Client/.vsixignore
@@ -87,6 +87,7 @@ Microsoft.VisualStudio.Services.TestResults.WebApi.dll
 Microsoft.VisualStudio.Services.WebApi.dll
 Microsoft.VisualStudio.Services.WebApi.resources.dll
 Microsoft.VisualStudio.TextTemplating.dll
+Microsoft.VisualStudio.TextTemplating.resources.dll
 Microsoft.VisualStudio.TextTemplating.Interfaces.dll
 Microsoft.VisualStudio.TextTemplating.VSHost.dll
 Microsoft.VisualStudio.Workspace.dll