diff --git a/dev/ComboBox/ComboBox_themeresources.xaml b/dev/ComboBox/ComboBox_themeresources.xaml
old mode 100644
new mode 100755
index 317d4f1e3b..28fac900af
--- a/dev/ComboBox/ComboBox_themeresources.xaml
+++ b/dev/ComboBox/ComboBox_themeresources.xaml
@@ -10,58 +10,44 @@
   xmlns:primitives="using:Microsoft.UI.Xaml.Controls.Primitives">
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Default">
-            <x:Double x:Key="ComboBoxArrowThemeFontSize">21</x:Double>
-            <x:Double x:Key="ComboBoxThemeMinWidth">64</x:Double>
-            <x:Double x:Key="ComboBoxPopupThemeMinWidth">80</x:Double>
-            <x:Double x:Key="ComboBoxPopupThemeTouchMinWidth">240</x:Double>
-            <Thickness x:Key="ComboBoxBorderThemeThickness">1</Thickness>
-            <Thickness x:Key="ComboBoxDropdownBorderThickness">1</Thickness>
-            <Thickness x:Key="ComboBoxHeaderThemeMargin">0,0,0,4</Thickness>
-            <Thickness x:Key="ComboBoxPopupBorderThemeThickness">2</Thickness>
-            <Thickness x:Key="ComboBoxItemThemePadding">11,5,11,7</Thickness>
-            <Thickness x:Key="ComboBoxItemThemeTouchPadding">11,11,11,13</Thickness>
-            <Thickness x:Key="ComboBoxItemThemeGameControllerPadding">11,11,11,13</Thickness>
-            <FontWeight x:Key="ComboBoxHeaderThemeFontWeight">Normal</FontWeight>
-            <FontWeight x:Key="ComboBoxPlaceholderTextThemeFontWeight">SemiLight</FontWeight>
             <StaticResource x:Key="ComboBoxItemForeground" ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="ComboBoxItemForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ComboBoxItemForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundSelected" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundSelectedUnfocused" ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="ComboBoxItemForegroundSelectedPressed" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ComboBoxItemForegroundSelectedPressed" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundSelectedPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundSelectedDisabled" ResourceKey="TextFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxItemBackground" ResourceKey="SubtleFillColorTransparentBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundDisabled" ResourceKey="SubtleFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelected" ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundDisabled" ResourceKey="SubtleFillColorDisabledBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelected" ResourceKey="SubtleFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundSelectedUnfocused" ResourceKey="SubtleFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelectedPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelectedPointerOver" ResourceKey="AccentAAFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelectedDisabled" ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelectedPressed" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelectedPointerOver" ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelectedDisabled" ResourceKey="SubtleFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushPressed" ResourceKey="SubtleFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushDisabled" ResourceKey="SubtleFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelected" ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushDisabled" ResourceKey="SubtleFillColorDisabledBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelected" ResourceKey="SubtleFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushSelectedUnfocused" ResourceKey="SubtleFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPressed" ResourceKey="SubtleFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedDisabled" ResourceKey="SubtleFillColorTransparentBrush" />
-
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPressed" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPointerOver" ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedDisabled" ResourceKey="SubtleFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxBackground" ResourceKey="ControlFillColorDefaultBrush" />
-            <StaticResource x:Key="ComboBoxBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxBackgroundDisabled" ResourceKey="ControlFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxBackgroundUnfocused" ResourceKey="SubtleFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxBackgroundFocused" ResourceKey="ComboBoxBackgroundUnfocused" />
-            <StaticResource x:Key="ComboBoxBackgroundBorderBrushFocused" ResourceKey="ControlStrokeColorDefaultBrush" />
+            <StaticResource x:Key="ComboBoxBackgroundPointerOver" ResourceKey="ControlFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxBackgroundPressed" ResourceKey="ControlFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxBackgroundDisabled" ResourceKey="ControlFillColorDisabledBrush" />
+            <StaticResource x:Key="ComboBoxBackgroundUnfocused" ResourceKey="ControlFillColorDefaultBrush" />
+            <StaticResource x:Key="ComboBoxBackgroundFocused" ResourceKey="ControlFillColorDefaultBrush" />
+            <StaticResource x:Key="ComboBoxBackgroundBorderBrushFocused" ResourceKey="FocusStrokeColorOuterBrush" />
             <StaticResource x:Key="ComboBoxBackgroundBorderBrushUnfocused" ResourceKey="ControlStrokeColorDefaultBrush" />
             <StaticResource x:Key="ComboBoxForeground" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="ComboBoxForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ComboBoxForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxForegroundFocused" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxForegroundFocusedPressed" ResourceKey="TextFillColorPrimaryBrush" />
@@ -69,24 +55,23 @@
             <StaticResource x:Key="ComboBoxHeaderForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxPlaceHolderForeground" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxPlaceHolderForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxPlaceHolderForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxPlaceHolderForegroundPressed" ResourceKey="TextFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxPlaceHolderForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxPlaceHolderForegroundFocused" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxPlaceHolderForegroundFocusedPressed" ResourceKey="TextFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxBorderBrush" ResourceKey="ControlAltFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxBorderBrushPointerOver" ResourceKey="ControlAAStrokeColorDefaultBrush" />
+            <StaticResource x:Key="ComboBoxBorderBrush" ResourceKey="ControlElevationBorderBrush" />
+            <StaticResource x:Key="ComboBoxBorderBrushPointerOver" ResourceKey="ControlElevationBorderBrush" />
             <StaticResource x:Key="ComboBoxBorderBrushPressed" ResourceKey="ControlStrokeColorDefaultBrush" />
-            <StaticResource x:Key="ComboBoxBorderBrushDisabled" ResourceKey="AccentAAFillColorDisabledBrush" />
+            <StaticResource x:Key="ComboBoxBorderBrushDisabled" ResourceKey="ControlStrokeColorDefaultBrush" />
             <StaticResource x:Key="ComboBoxDropDownGlyphForeground" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxDropDownGlyphForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
-            <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocused" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+            <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocused" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
-            <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
             <StaticResource x:Key="ComboBoxDropDownForeground" ResourceKey="TextFillColorPrimaryBrush" />
+            <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
             <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SurfaceStrokeColorDefaultBrush" />
-            <contract7Present:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="AcrylicBackgroundFillColorDefaultBrush" />
-            <contract7Present:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SurfaceStrokeColorDefaultBrush" />
-
+            <contract7Present:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
+            <contract7Present:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SurfaceStrokeColorFlyoutBrush" />
             <StaticResource x:Key="ComboBoxLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
             <SolidColorBrush x:Key="ComboBoxArrowDisabledForegroundThemeBrush" Color="#66FFFFFF" />
             <SolidColorBrush x:Key="ComboBoxArrowForegroundThemeBrush" Color="#FF000000" />
@@ -123,14 +108,12 @@
             <SolidColorBrush x:Key="ComboBoxPressedForegroundThemeBrush" Color="#FF000000" />
             <SolidColorBrush x:Key="ComboBoxSelectedBackgroundThemeBrush" Color="#FF4617B4" />
             <SolidColorBrush x:Key="ComboBoxSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
-
-            <Thickness x:Key="ComboBoxDropdownBorderPadding">0</Thickness>
-            <Thickness x:Key="ComboBoxDropdownContentMargin">0,4,0,4</Thickness>
             <StaticResource x:Key="ComboBoxDropDownBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxDropDownBackgroundPointerPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerOver" ResourceKey="ControlFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerPressed" ResourceKey="ControlAltFillColorQuarternaryBrush" />
             <StaticResource x:Key="ComboBoxEditableDropDownGlyphForeground" ResourceKey="TextFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemPillFillBrush" ResourceKey="AccentAAFillColorDefaultBrush"/>
         </ResourceDictionary>
         <ResourceDictionary x:Key="HighContrast">
             <StaticResource x:Key="ComboBoxItemForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
@@ -160,7 +143,6 @@
             <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPressed" ResourceKey="SystemControlTransparentBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPointerOver" ResourceKey="SystemControlTransparentBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushSelectedDisabled" ResourceKey="SystemControlTransparentBrush" />
-
             <StaticResource x:Key="ComboBoxBackground" ResourceKey="SystemControlBackgroundAltMediumLowBrush" />
             <StaticResource x:Key="ComboBoxBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
             <StaticResource x:Key="ComboBoxBackgroundPressed" ResourceKey="SystemControlBackgroundListMediumBrush" />
@@ -191,26 +173,12 @@
             <StaticResource x:Key="ComboBoxDropDownGlyphForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
             <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocused" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
             <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
-            <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
             <StaticResource x:Key="ComboBoxDropDownForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+            <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
             <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SystemControlForegroundChromeHighBrush" />
             <contract7Present:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
             <contract7Present:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SystemControlForegroundChromeHighBrush" />
-
             <StaticResource x:Key="ComboBoxLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
-            <x:Double x:Key="ComboBoxArrowThemeFontSize">21</x:Double>
-            <x:Double x:Key="ComboBoxThemeMinWidth">64</x:Double>
-            <x:Double x:Key="ComboBoxPopupThemeMinWidth">80</x:Double>
-            <x:Double x:Key="ComboBoxPopupThemeTouchMinWidth">240</x:Double>
-            <Thickness x:Key="ComboBoxBorderThemeThickness">1</Thickness>
-            <Thickness x:Key="ComboBoxDropdownBorderThickness">1</Thickness>
-            <Thickness x:Key="ComboBoxHeaderThemeMargin">0,0,0,4</Thickness>
-            <Thickness x:Key="ComboBoxPopupBorderThemeThickness">2</Thickness>
-            <Thickness x:Key="ComboBoxItemThemePadding">11,5,11,7</Thickness>
-            <Thickness x:Key="ComboBoxItemThemeTouchPadding">11,11,11,13</Thickness>
-            <Thickness x:Key="ComboBoxItemThemeGameControllerPadding">11,11,11,13</Thickness>
-            <FontWeight x:Key="ComboBoxHeaderThemeFontWeight">Normal</FontWeight>
-            <FontWeight x:Key="ComboBoxPlaceholderTextThemeFontWeight">SemiLight</FontWeight>
             <SolidColorBrush x:Key="ComboBoxArrowDisabledForegroundThemeBrush" Color="{ThemeResource SystemColorGrayTextColor}" />
             <SolidColorBrush x:Key="ComboBoxArrowForegroundThemeBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
             <SolidColorBrush x:Key="ComboBoxArrowPressedForegroundThemeBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
@@ -246,68 +214,52 @@
             <SolidColorBrush x:Key="ComboBoxPressedForegroundThemeBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
             <SolidColorBrush x:Key="ComboBoxSelectedBackgroundThemeBrush" Color="{ThemeResource SystemColorHighlightColor}" />
             <SolidColorBrush x:Key="ComboBoxSelectedPointerOverBackgroundThemeBrush" Color="{ThemeResource SystemColorHighlightColor}" />
-
             <StaticResource x:Key="ComboBoxDropDownBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
             <StaticResource x:Key="ComboBoxDropDownBackgroundPointerPressed" ResourceKey="SystemControlBackgroundListMediumBrush" />
             <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerOver" ResourceKey="SystemControlPageBackgroundAltMediumBrush" />
             <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerPressed" ResourceKey="SystemControlBackgroundListMediumBrush" />
             <StaticResource x:Key="ComboBoxEditableDropDownGlyphForeground" ResourceKey="SystemControlForegroundBaseMediumHighBrush" />
-            <Thickness x:Key="ComboBoxDropdownBorderPadding">0</Thickness>
-            <Thickness x:Key="ComboBoxDropdownContentMargin">0,4,0,4</Thickness>
+            <StaticResource x:Key="ComboBoxItemPillFillBrush" ResourceKey="SystemControlHighlightListAccentLowBrush"/>
         </ResourceDictionary>
         <ResourceDictionary x:Key="Light">
-            <x:Double x:Key="ComboBoxArrowThemeFontSize">21</x:Double>
-            <x:Double x:Key="ComboBoxThemeMinWidth">64</x:Double>
-            <x:Double x:Key="ComboBoxPopupThemeMinWidth">80</x:Double>
-            <x:Double x:Key="ComboBoxPopupThemeTouchMinWidth">240</x:Double>
-            <Thickness x:Key="ComboBoxBorderThemeThickness">1</Thickness>
-            <Thickness x:Key="ComboBoxDropdownBorderThickness">1</Thickness>
-            <Thickness x:Key="ComboBoxHeaderThemeMargin">0,0,0,4</Thickness>
-            <Thickness x:Key="ComboBoxPopupBorderThemeThickness">2</Thickness>
-            <Thickness x:Key="ComboBoxItemThemePadding">11,5,11,7</Thickness>
-            <Thickness x:Key="ComboBoxItemThemeTouchPadding">11,11,11,13</Thickness>
-            <Thickness x:Key="ComboBoxItemThemeGameControllerPadding">11,11,11,13</Thickness>
-            <FontWeight x:Key="ComboBoxHeaderThemeFontWeight">Normal</FontWeight>
-            <FontWeight x:Key="ComboBoxPlaceholderTextThemeFontWeight">SemiLight</FontWeight>
             <StaticResource x:Key="ComboBoxItemForeground" ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="ComboBoxItemForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ComboBoxItemForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundSelected" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundSelectedUnfocused" ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="ComboBoxItemForegroundSelectedPressed" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ComboBoxItemForegroundSelectedPressed" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundSelectedPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxItemForegroundSelectedDisabled" ResourceKey="TextFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxItemBackground" ResourceKey="SubtleFillColorTransparentBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundDisabled" ResourceKey="SubtleFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelected" ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundDisabled" ResourceKey="SubtleFillColorDisabledBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelected" ResourceKey="SubtleFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemBackgroundSelectedUnfocused" ResourceKey="SubtleFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelectedPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelectedPointerOver" ResourceKey="AccentAAFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxItemBackgroundSelectedDisabled" ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelectedPressed" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelectedPointerOver" ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBackgroundSelectedDisabled" ResourceKey="SubtleFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrush" ResourceKey="SubtleFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushPressed" ResourceKey="SubtleFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushDisabled" ResourceKey="SubtleFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelected" ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushDisabled" ResourceKey="SubtleFillColorDisabledBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelected" ResourceKey="SubtleFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxItemBorderBrushSelectedUnfocused" ResourceKey="SubtleFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPressed" ResourceKey="SubtleFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPointerOver" ResourceKey="SubtleFillColorTransparentBrush" />
-            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedDisabled" ResourceKey="SubtleFillColorTransparentBrush" />
-
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPressed" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedPointerOver" ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxItemBorderBrushSelectedDisabled" ResourceKey="SubtleFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxBackground" ResourceKey="ControlFillColorDefaultBrush" />
-            <StaticResource x:Key="ComboBoxBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxBackgroundDisabled" ResourceKey="ControlFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxBackgroundUnfocused" ResourceKey="SubtleFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxBackgroundFocused" ResourceKey="ComboBoxBackgroundUnfocused" />
-            <StaticResource x:Key="ComboBoxBackgroundBorderBrushFocused" ResourceKey="ControlStrokeColorDefaultBrush" />
+            <StaticResource x:Key="ComboBoxBackgroundPointerOver" ResourceKey="ControlFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxBackgroundPressed" ResourceKey="ControlFillColorTertiaryBrush" />
+            <StaticResource x:Key="ComboBoxBackgroundDisabled" ResourceKey="ControlFillColorDisabledBrush" />
+            <StaticResource x:Key="ComboBoxBackgroundUnfocused" ResourceKey="ControlFillColorDefaultBrush" />
+            <StaticResource x:Key="ComboBoxBackgroundFocused" ResourceKey="ControlFillColorDefaultBrush" />
+            <StaticResource x:Key="ComboBoxBackgroundBorderBrushFocused" ResourceKey="FocusStrokeColorOuterBrush" />
             <StaticResource x:Key="ComboBoxBackgroundBorderBrushUnfocused" ResourceKey="ControlStrokeColorDefaultBrush" />
             <StaticResource x:Key="ComboBoxForeground" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
-            <StaticResource x:Key="ComboBoxForegroundPressed" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="ComboBoxForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxForegroundFocused" ResourceKey="TextFillColorPrimaryBrush" />
             <StaticResource x:Key="ComboBoxForegroundFocusedPressed" ResourceKey="TextFillColorPrimaryBrush" />
@@ -315,24 +267,23 @@
             <StaticResource x:Key="ComboBoxHeaderForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxPlaceHolderForeground" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxPlaceHolderForegroundPointerOver" ResourceKey="TextFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxPlaceHolderForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxPlaceHolderForegroundPressed" ResourceKey="TextFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxPlaceHolderForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
             <StaticResource x:Key="ComboBoxPlaceHolderForegroundFocused" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxPlaceHolderForegroundFocusedPressed" ResourceKey="TextFillColorSecondaryBrush" />
-            <StaticResource x:Key="ComboBoxBorderBrush" ResourceKey="ControlAltFillColorTertiaryBrush" />
-            <StaticResource x:Key="ComboBoxBorderBrushPointerOver" ResourceKey="ControlAAStrokeColorDefaultBrush" />
+            <StaticResource x:Key="ComboBoxBorderBrush" ResourceKey="ControlElevationBorderBrush" />
+            <StaticResource x:Key="ComboBoxBorderBrushPointerOver" ResourceKey="ControlElevationBorderBrush" />
             <StaticResource x:Key="ComboBoxBorderBrushPressed" ResourceKey="ControlStrokeColorDefaultBrush" />
-            <StaticResource x:Key="ComboBoxBorderBrushDisabled" ResourceKey="AccentAAFillColorDisabledBrush" />
+            <StaticResource x:Key="ComboBoxBorderBrushDisabled" ResourceKey="ControlStrokeColorDefaultBrush" />
             <StaticResource x:Key="ComboBoxDropDownGlyphForeground" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxDropDownGlyphForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
-            <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocused" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
+            <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocused" ResourceKey="TextFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxDropDownGlyphForegroundFocusedPressed" ResourceKey="SystemControlHighlightAltBaseMediumHighBrush" />
-            <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
             <StaticResource x:Key="ComboBoxDropDownForeground" ResourceKey="TextFillColorPrimaryBrush" />
+            <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="SystemControlBackgroundChromeMediumLowBrush" />
             <contract7NotPresent:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SurfaceStrokeColorDefaultBrush" />
-            <contract7Present:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="AcrylicBackgroundFillColorDefaultBrush" />
-            <contract7Present:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SurfaceStrokeColorDefaultBrush" />
-
+            <contract7Present:StaticResource x:Key="ComboBoxDropDownBackground" ResourceKey="AcrylicInAppFillColorDefaultBrush" />
+            <contract7Present:StaticResource x:Key="ComboBoxDropDownBorderBrush" ResourceKey="SurfaceStrokeColorFlyoutBrush" />
             <StaticResource x:Key="ComboBoxLightDismissOverlayBackground" ResourceKey="SystemControlPageBackgroundMediumAltMediumBrush" />
             <SolidColorBrush x:Key="ComboBoxArrowDisabledForegroundThemeBrush" Color="#66000000" />
             <SolidColorBrush x:Key="ComboBoxArrowForegroundThemeBrush" Color="#FF000000" />
@@ -369,24 +320,62 @@
             <SolidColorBrush x:Key="ComboBoxPressedForegroundThemeBrush" Color="#FF000000" />
             <SolidColorBrush x:Key="ComboBoxSelectedBackgroundThemeBrush" Color="#FF4617B4" />
             <SolidColorBrush x:Key="ComboBoxSelectedPointerOverBackgroundThemeBrush" Color="#FF5F37BE" />
-
-            <Thickness x:Key="ComboBoxDropdownBorderPadding">0</Thickness>
-            <Thickness x:Key="ComboBoxDropdownContentMargin">0,4,0,4</Thickness>
             <StaticResource x:Key="ComboBoxDropDownBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
             <StaticResource x:Key="ComboBoxDropDownBackgroundPointerPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerOver" ResourceKey="ControlFillColorTertiaryBrush" />
             <StaticResource x:Key="ComboBoxFocusedDropDownBackgroundPointerPressed" ResourceKey="ControlAltFillColorQuarternaryBrush" />
             <StaticResource x:Key="ComboBoxEditableDropDownGlyphForeground" ResourceKey="TextFillColorSecondaryBrush" />
+            <StaticResource x:Key="ComboBoxItemPillFillBrush" ResourceKey="AccentAAFillColorDefaultBrush"/>
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
-    <Thickness x:Key="ComboBoxTopHeaderMargin">0,0,0,4</Thickness>
+    <x:Double x:Key="ComboBoxArrowThemeFontSize">21</x:Double>
+    <x:Double x:Key="ComboBoxThemeMinWidth">64</x:Double>
+    <x:Double x:Key="ComboBoxPopupThemeMinWidth">80</x:Double>
+    <x:Double x:Key="ComboBoxPopupThemeTouchMinWidth">240</x:Double>
+    <x:Double x:Key="ComboBoxItemPillHeight">16</x:Double>
+    <x:Double x:Key="ComboBoxItemPillWidth">3</x:Double>
+    <x:Double x:Key="ComboBoxItemPillMinScale">0.625</x:Double>
+    <x:Double x:Key="ComboBoxMinHeight">32</x:Double>
+
     <x:Int32 x:Key="ComboBoxPopupMaxNumberOfItems">15</x:Int32>
     <x:Int32 x:Key="ComboBoxPopupMaxNumberOfItemsThatCanBeShownOnOneSide">7</x:Int32>
 
+    <x:String x:Key="ComboBoxItemScaleAnimationDuration">00:00:00.167</x:String>
+
+    <Thickness x:Key="ComboBoxBorderThemeThickness">1</Thickness>
+    <Thickness x:Key="ComboBoxDropdownBorderThickness">1</Thickness>
+    <Thickness x:Key="ComboBoxHeaderThemeMargin">0,0,0,4</Thickness>
+    <Thickness x:Key="ComboBoxPopupBorderThemeThickness">2</Thickness>
+    <Thickness x:Key="ComboBoxItemThemePadding">11,5,11,7</Thickness>
+    <Thickness x:Key="ComboBoxItemThemeTouchPadding">11,11,11,13</Thickness>
+    <Thickness x:Key="ComboBoxItemThemeGameControllerPadding">11,11,11,13</Thickness>
+    <Thickness x:Key="ComboBoxBackgroundBorderThicknessFocused">2</Thickness>
+    <Thickness x:Key="ComboBoxDropdownBorderPadding">0</Thickness>
+    <Thickness x:Key="ComboBoxDropdownContentMargin">0,4</Thickness>
+    <Thickness x:Key="ComboBoxTopHeaderMargin">0,0,0,8</Thickness>
     <Thickness x:Key="ComboBoxPadding">12,5,0,7</Thickness>
     <Thickness x:Key="ComboBoxEditableTextPadding">11,5,32,6</Thickness>
-    <Thickness x:Key="ComboBoxMinHeight">32</Thickness>
+
+    <CornerRadius x:Key="ComboBoxHiglightBorderCornerRadius">7</CornerRadius>
+    <CornerRadius x:Key="ComboBoxDropDownButtonBackgroundCornerRadius">4</CornerRadius>
+    <CornerRadius x:Key="ComboBoxItemCornerRadius">3</CornerRadius>
+    <CornerRadius x:Key="ComboBoxItemPillCornerRadius">1.5</CornerRadius>
+    
+    <FontWeight x:Key="ComboBoxHeaderThemeFontWeight">Normal</FontWeight>
+    <FontWeight x:Key="ComboBoxPlaceholderTextThemeFontWeight">SemiLight</FontWeight>
+
+    <Style x:Key="ComboBoxItemPill" TargetType="Rectangle">
+        <Setter Property="HorizontalAlignment" Value="Left"/>
+        <Setter Property="Height" Value="{StaticResource ComboBoxItemPillHeight}"/>
+        <Setter Property="Width" Value="{StaticResource ComboBoxItemPillWidth}"/>
+        <Setter Property="Fill" Value="{ThemeResource ComboBoxItemPillFillBrush}"/>
+        <contract7Present:Setter Property="RadiusX" Value="{Binding Source={StaticResource ComboBoxItemPillCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"/>
+        <contract7Present:Setter Property="RadiusY" Value="{Binding Source={StaticResource ComboBoxItemPillCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}"/>
+        <contract7NotPresent:Setter Property="RadiusX" Value="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource TopLeftCornerRadiusDoubleValueConverter}}"/>
+        <contract7NotPresent:Setter Property="RadiusY" Value="{Binding Source={ThemeResource ControlCornerRadius}, Converter={StaticResource BottomRightCornerRadiusDoubleValueConverter}}"/>
+        <Setter Property="RenderTransformOrigin" Value="0.5,0.5"/>
+    </Style>
 
     <Style TargetType="ComboBox" BasedOn="{StaticResource DefaultComboBoxStyle}"/>
 
@@ -441,15 +430,12 @@
                         </Grid.Resources>
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
-                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="Normal"/>
                                 <VisualState x:Name="PointerOver">
                                     <Storyboard>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Background" Storyboard.TargetProperty="Background">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxBackgroundPointerOver}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Background" Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxBorderBrushPointerOver}" />
-                                        </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxForegroundPointerOver}" />
                                         </ObjectAnimationUsingKeyFrames>
@@ -507,12 +493,10 @@
                                             Storyboard.TargetProperty="Opacity"
                                             To="1"
                                             Duration="0" />
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HighlightBackground" Storyboard.TargetProperty="Background">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxBackgroundFocused}" />
-                                        </ObjectAnimationUsingKeyFrames>
-                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="HighlightBackground" Storyboard.TargetProperty="BorderBrush">
-                                            <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxBackgroundBorderBrushFocused}" />
-                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimation Storyboard.TargetName="Pill"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0" />
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxForegroundFocused}" />
                                         </ObjectAnimationUsingKeyFrames>
@@ -531,6 +515,10 @@
                                             Storyboard.TargetProperty="Opacity"
                                             To="1"
                                             Duration="0" />
+                                        <DoubleAnimation Storyboard.TargetName="Pill"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="1"
+                                            Duration="0" />
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxForegroundFocusedPressed}" />
                                         </ObjectAnimationUsingKeyFrames>
@@ -579,14 +567,12 @@
                                 <VisualState x:Name="TextBoxFocused">
                                     <VisualState.Setters>
                                         <Setter Target="DropDownGlyph.Foreground" Value="{ThemeResource ComboBoxEditableDropDownGlyphForeground}" />
-                                        <Setter Target="DropDownOverlay.Margin" Value="0,2,2,2" />
                                     </VisualState.Setters>
                                 </VisualState>
                                 <VisualState x:Name="TextBoxFocusedOverlayPointerOver">
                                     <VisualState.Setters>
                                         <Setter Target="DropDownGlyph.Foreground" Value="{ThemeResource ComboBoxEditableDropDownGlyphForeground}" />
-                                        <Setter Target="DropDownOverlay.Background" Value="{ThemeResource ComboBoxFocusedDropDownBackgroundPointerOver}" />
-                                        <Setter Target="DropDownOverlay.Margin" Value="0,2,2,2" />
+                                        <Setter Target="DropDownOverlay.Background" Value="{ThemeResource ComboBoxDropDownBackgroundPointerOver}" />
                                     </VisualState.Setters>
                                 </VisualState>
                                 <VisualState x:Name="TextBoxFocusedOverlayPressed">
@@ -606,7 +592,7 @@
                                         <Setter Target="DropDownOverlay.Background" Value="{ThemeResource ComboBoxDropDownBackgroundPointerPressed}" />
                                     </VisualState.Setters>
                                 </VisualState>
-                                <VisualState x:Name="TextBoxUnfocused" />
+                                <VisualState x:Name="TextBoxUnfocused"/>
                             </contract7Present:VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
                         <Grid.RowDefinitions>
@@ -632,10 +618,24 @@
                             VerticalAlignment="Top"
                             Visibility="Collapsed"
                             x:DeferLoadStrategy="Lazy" />
+
+                        <Border x:Name="HighlightBackground"
+                            Grid.Row="1"
+                            Grid.Column="0"
+                            Grid.ColumnSpan="2"
+                            Margin="-4"
+                            Background="{ThemeResource ComboBoxBackgroundFocused}"
+                            BorderBrush="{ThemeResource ComboBoxBackgroundBorderBrushFocused}"
+                            BorderThickness="{StaticResource ComboBoxBackgroundBorderThicknessFocused}"
+                            contract7Present:CornerRadius="{StaticResource ComboBoxHiglightBorderCornerRadius}"
+                            contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}"
+                            Opacity="0" />
+
                         <Border x:Name="Background"
                             Grid.Row="1"
                             Grid.Column="0"
                             Grid.ColumnSpan="2"
+                            contract7Present:Translation="0,0,1"
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
@@ -643,16 +643,17 @@
                             contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}"
                             Control.IsTemplateFocusTarget="True"
                             MinWidth="{ThemeResource ComboBoxThemeMinWidth}" />
-                        <Border x:Name="HighlightBackground"
-                            Grid.Row="1"
-                            Grid.Column="0"
-                            Grid.ColumnSpan="2"
-                            Background="{ThemeResource ComboBoxBackgroundUnfocused}"
-                            BorderBrush="{ThemeResource ComboBoxBackgroundBorderBrushUnfocused}"
-                            BorderThickness="{TemplateBinding BorderThickness}"
-                            contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
-                            contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}"
-                            Opacity="0" />
+
+                        <Rectangle x:Name="Pill"
+                            Style="{StaticResource ComboBoxItemPill}"
+                            Margin="1,0,0,0"
+                            Grid.Row="1" Grid.Column="0"
+                            Opacity="0">
+                            <Rectangle.RenderTransform>
+                                <CompositeTransform x:Name="PillTransform" ScaleY="1" />
+                            </Rectangle.RenderTransform>
+                        </Rectangle>
+
                         <ContentPresenter x:Name="ContentPresenter"
                             Grid.Row="1"
                             Grid.Column="0"
@@ -664,14 +665,15 @@
                                 contract5NotPresent:Foreground="{ThemeResource ComboBoxPlaceHolderForeground}"
                                 contract5Present:Foreground="{Binding PlaceholderForeground, RelativeSource={RelativeSource TemplatedParent}, TargetNullValue={ThemeResource ComboBoxPlaceHolderForeground}}" />
                         </ContentPresenter>
+
                         <contract7Present:TextBox x:Name="EditableText"
                             Grid.Row="1"
                             Grid.Column="0"
                             Grid.ColumnSpan="2"
-                            Style="{StaticResource ComboBoxTextBoxStyle}"
+                            Style="{TemplateBinding TextBoxStyle}"
                             Margin="0,0,0,0"
                             Padding="{ThemeResource ComboBoxEditableTextPadding}"
-                            BorderBrush="Transparent"
+                            BorderBrush="Transparent"                  
                             HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                             PlaceholderText="{TemplateBinding PlaceholderText}"
@@ -683,21 +685,23 @@
                             x:Load="False"
                             contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
                             contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}" />
-                        <contract7Present:Border x:Name="DropDownOverlay"
+                        <Border x:Name="DropDownOverlay"
                             Grid.Row="1"
                             Grid.Column="1"
                             Background="Transparent"
-                            Margin="0,1,1,1"
+                            Margin="-4,4,4,4"
                             Visibility="Collapsed"
+                            contract7Present:CornerRadius="{StaticResource ComboBoxDropDownButtonBackgroundCornerRadius}"
+                            contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}"
                             Width="30"
                             HorizontalAlignment="Right"
-                            x:Load="False"/>
+                            x:Load="False" />
                         <FontIcon x:Name="DropDownGlyph"
                             MinHeight="{ThemeResource ComboBoxMinHeight}"
                             Grid.Row="1"
                             Grid.Column="1"
                             IsHitTestVisible="False"
-                            Margin="0,0,10,0"
+                            Margin="0,0,14,0"
                             Foreground="{ThemeResource ComboBoxDropDownGlyphForeground}"
                             FontFamily="{ThemeResource SymbolThemeFontFamily}"
                             FontSize="12"
@@ -718,7 +722,7 @@
                                 contract7Present:BackgroundSizing="OuterBorderEdge"
                                 BorderBrush="{ThemeResource ComboBoxDropDownBorderBrush}"
                                 BorderThickness="{ThemeResource ComboBoxDropdownBorderThickness}"
-                                Margin="0,-1,0,-1"
+                                Margin="0,-0.5,0,-1"
                                 Padding="{ThemeResource ComboBoxDropdownBorderPadding}"
                                 HorizontalAlignment="Stretch"
                                 CornerRadius="{ThemeResource OverlayCornerRadius}">
@@ -747,13 +751,17 @@
         </Setter>
     </Style>
 
-    <Style TargetType="ComboBoxItem">
+    <Style TargetType="ComboBoxItem" BasedOn="{StaticResource DefaultComboBoxItemStyle}"/>
+        
+    <Style TargetType="ComboBoxItem" x:Key="DefaultComboBoxItemStyle">
         <Setter Property="Foreground" Value="{ThemeResource ComboBoxItemForeground}" />
         <Setter Property="Background" Value="{ThemeResource ComboBoxItemBackground}" />
         <Setter Property="TabNavigation" Value="Local" />
         <Setter Property="Padding" Value="{ThemeResource ComboBoxItemThemePadding}" />
         <Setter Property="HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="UseSystemFocusVisuals" Value="True" />
+        <Setter Property="FocusVisualMargin" Value="-3"/>
+        <contract7Present:Setter Property="CornerRadius" Value="{StaticResource ComboBoxItemCornerRadius}"/>
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="ComboBoxItem">
@@ -761,6 +769,9 @@
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
                         BorderThickness="{TemplateBinding BorderThickness}"
+                        Margin="5,2,5,2"
+                        contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
+                        contract7NotPresent:CornerRadius="{ThemeResource ControlCornerRadius}"
                         Control.IsTemplateFocusTarget="True">
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
@@ -807,11 +818,13 @@
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Foreground">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxItemForegroundPressed}" />
                                         </ObjectAnimationUsingKeyFrames>
-                                        <PointerDownThemeAnimation Storyboard.TargetName="LayoutRoot" />
                                     </Storyboard>
                                 </VisualState>
                                 <VisualState x:Name="Selected">
                                     <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Pill" Storyboard.TargetProperty="Opacity">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="1" />
+                                        </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="Background">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxItemBackgroundSelected}" />
                                         </ObjectAnimationUsingKeyFrames>
@@ -826,6 +839,9 @@
                                 </VisualState>
                                 <VisualState x:Name="SelectedUnfocused">
                                     <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Pill" Storyboard.TargetProperty="Opacity">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="1" />
+                                        </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="Background">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxItemBackgroundSelectedUnfocused}" />
                                         </ObjectAnimationUsingKeyFrames>
@@ -839,6 +855,9 @@
                                 </VisualState>
                                 <VisualState x:Name="SelectedDisabled">
                                     <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Pill" Storyboard.TargetProperty="Opacity">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="1" />
+                                        </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="Background">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxItemBackgroundSelectedDisabled}" />
                                         </ObjectAnimationUsingKeyFrames>
@@ -852,6 +871,9 @@
                                 </VisualState>
                                 <VisualState x:Name="SelectedPointerOver">
                                     <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Pill" Storyboard.TargetProperty="Opacity">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="1" />
+                                        </ObjectAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="Background">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxItemBackgroundSelectedPointerOver}" />
                                         </ObjectAnimationUsingKeyFrames>
@@ -866,6 +888,12 @@
                                 </VisualState>
                                 <VisualState x:Name="SelectedPressed">
                                     <Storyboard>
+                                        <ObjectAnimationUsingKeyFrames Storyboard.TargetName="Pill" Storyboard.TargetProperty="Opacity">
+                                            <DiscreteObjectKeyFrame KeyTime="0" Value="1" />
+                                        </ObjectAnimationUsingKeyFrames>
+                                        <DoubleAnimationUsingKeyFrames Storyboard.TargetName="PillTransform" Storyboard.TargetProperty="ScaleY">
+                                            <SplineDoubleKeyFrame KeyTime="{StaticResource ComboBoxItemScaleAnimationDuration}" Value="{StaticResource ComboBoxItemPillMinScale}" KeySpline="0,0,0,1" />
+                                        </DoubleAnimationUsingKeyFrames>
                                         <ObjectAnimationUsingKeyFrames Storyboard.TargetName="LayoutRoot" Storyboard.TargetProperty="Background">
                                             <DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ComboBoxItemBackgroundSelectedPressed}" />
                                         </ObjectAnimationUsingKeyFrames>
@@ -896,6 +924,17 @@
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
+
+                        <Rectangle
+                            x:Name="Pill"
+                            Style="{StaticResource ComboBoxItemPill}"
+                            Grid.Row="1" Grid.Column="0"
+                            Opacity="0">
+                            <Rectangle.RenderTransform>
+                                <CompositeTransform x:Name="PillTransform" ScaleY="1"/>
+                            </Rectangle.RenderTransform>
+                        </Rectangle>
+
                         <ContentPresenter x:Name="ContentPresenter"
                             Content="{TemplateBinding Content}"
                             ContentTransitions="{TemplateBinding ContentTransitions}"
@@ -946,7 +985,7 @@
                                 </VisualState>
                             </VisualStateGroup>
                         </VisualStateManager.VisualStateGroups>
-                        
+
                         <Border x:Name="BorderElement"
                             Background="{TemplateBinding Background}"
                             BorderBrush="{TemplateBinding BorderBrush}"
@@ -980,5 +1019,4 @@
             </Setter.Value>
         </Setter>
     </contract7Present:Style>
-
 </ResourceDictionary>
diff --git a/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs b/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs
old mode 100644
new mode 100755
index 280bad18a1..c3e96c3fc1
--- a/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs
+++ b/dev/CommonStyles/TestUI/CommonStylesPage.xaml.cs
@@ -248,8 +248,8 @@ private void HeaderContentPresenterMarginTest(DependencyObject control)
             var root = (FrameworkElement)VisualTreeHelper.GetChild(control, 0);
             var contentPresenter = (ContentPresenter)root.FindName("HeaderContentPresenter");
             simpleVerify.IsTrue(contentPresenter != null, "HeaderContentPresenter can't be found");
-
-            string expectedHeaderMargin = "0,0,0,4";
+            
+            string expectedHeaderMargin = control == ComboBox ? "0,0,0,8" : "0,0,0,4";
             if (contentPresenter != null)
             {
                 simpleVerify.IsEqual(contentPresenter.Margin.ToString(), expectedHeaderMargin, "HeaderContentPresenter.Margin");
diff --git a/dev/dll/DensityStyles/Compact.xaml b/dev/dll/DensityStyles/Compact.xaml
index 8c43a10d2c..d0e85cbbed 100644
--- a/dev/dll/DensityStyles/Compact.xaml
+++ b/dev/dll/DensityStyles/Compact.xaml
@@ -15,7 +15,7 @@
     <Thickness x:Key="DatePickerHostPadding">0,1,0,2</Thickness>
     <Thickness x:Key="DatePickerHostMonthPadding">9,0,0,1</Thickness>
     <Thickness x:Key="ComboBoxEditableTextPadding">10,0,30,0</Thickness>
-    <Thickness x:Key="ComboBoxMinHeight">24</Thickness>
+    <x:Double x:Key="ComboBoxMinHeight">24</x:Double>
     <Thickness x:Key="ComboBoxPadding">12,1,0,3</Thickness>
     <x:Double x:Key="NavigationViewItemOnLeftMinHeight">32</x:Double>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/test/MUXControlsTestApp/verification/ComboBox-4.xml b/test/MUXControlsTestApp/verification/ComboBox-4.xml
old mode 100644
new mode 100755
index d92ce09145..cf19921da3
--- a/test/MUXControlsTestApp/verification/ComboBox-4.xml
+++ b/test/MUXControlsTestApp/verification/ComboBox-4.xml
@@ -2,7 +2,7 @@
     Padding=12,5,0,7
     Foreground=#E4000000
     BorderThickness=1,1,1,1
-    BorderBrush=#0F000000
+    BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
     Background=#B3FFFFFF
     MinWidth=64
     Margin=0,0,0,0
@@ -29,25 +29,25 @@
     [Windows.UI.Xaml.Controls.Border]
         Padding=0,0,0,0
         CornerRadius=4,4,4,4
-        BorderThickness=1,1,1,1
-        BorderBrush=#0F000000
+        BorderThickness=2,2,2,2
+        BorderBrush=#E4000000
         Background=#B3FFFFFF
-        Name=Background
-        MinWidth=64
-        Margin=0,0,0,0
+        Name=HighlightBackground
+        Margin=-4,-4,-4,-4
         FocusVisualSecondaryThickness=1,1,1,1
         FocusVisualSecondaryBrush=#99FFFFFF
         FocusVisualPrimaryThickness=2,2,2,2
         FocusVisualPrimaryBrush=#FF000000
         Visibility=Visible
-        RenderSize=64,32
+        RenderSize=72,40
     [Windows.UI.Xaml.Controls.Border]
         Padding=0,0,0,0
         CornerRadius=4,4,4,4
         BorderThickness=1,1,1,1
-        BorderBrush=#0F000000
-        Background=#0A000000
-        Name=HighlightBackground
+        BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
+        Background=#B3FFFFFF
+        Name=Background
+        MinWidth=64
         Margin=0,0,0,0
         FocusVisualSecondaryThickness=1,1,1,1
         FocusVisualSecondaryBrush=#99FFFFFF
@@ -55,6 +55,18 @@
         FocusVisualPrimaryBrush=#FF000000
         Visibility=Visible
         RenderSize=64,32
+    [Windows.UI.Xaml.Shapes.Rectangle]
+        StrokeThickness=1
+        Width=3
+        Name=Pill
+        Margin=1,0,0,0
+        Height=16
+        FocusVisualSecondaryThickness=1,1,1,1
+        FocusVisualSecondaryBrush=#99FFFFFF
+        FocusVisualPrimaryThickness=2,2,2,2
+        FocusVisualPrimaryBrush=#FF000000
+        Visibility=Visible
+        RenderSize=3,16
     [Windows.UI.Xaml.Controls.ContentPresenter]
         Foreground=#E4000000
         Padding=0,0,0,0
@@ -85,7 +97,7 @@
         Foreground=#93000000
         Name=DropDownGlyph
         MinHeight=32
-        Margin=0,0,10,0
+        Margin=0,0,14,0
         FocusVisualSecondaryThickness=1,1,1,1
         FocusVisualSecondaryBrush=#99FFFFFF
         FocusVisualPrimaryThickness=2,2,2,2
diff --git a/test/MUXControlsTestApp/verification/ComboBox-5.xml b/test/MUXControlsTestApp/verification/ComboBox-5.xml
deleted file mode 100644
index d92ce09145..0000000000
--- a/test/MUXControlsTestApp/verification/ComboBox-5.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-[Windows.UI.Xaml.Controls.ComboBox]
-    Padding=12,5,0,7
-    Foreground=#E4000000
-    BorderThickness=1,1,1,1
-    BorderBrush=#0F000000
-    Background=#B3FFFFFF
-    MinWidth=64
-    Margin=0,0,0,0
-    FocusVisualSecondaryThickness=1,1,1,1
-    FocusVisualSecondaryBrush=#99FFFFFF
-    FocusVisualPrimaryThickness=2,2,2,2
-    FocusVisualPrimaryBrush=#FF000000
-    Visibility=Visible
-    RenderSize=64,32
-  [Windows.UI.Xaml.Controls.Grid]
-      Padding=0,0,0,0
-      CornerRadius=0,0,0,0
-      BorderThickness=0,0,0,0
-      BorderBrush=[NULL]
-      Background=[NULL]
-      Name=LayoutRoot
-      Margin=0,0,0,0
-      FocusVisualSecondaryThickness=1,1,1,1
-      FocusVisualSecondaryBrush=#99FFFFFF
-      FocusVisualPrimaryThickness=2,2,2,2
-      FocusVisualPrimaryBrush=#FF000000
-      Visibility=Visible
-      RenderSize=64,32
-    [Windows.UI.Xaml.Controls.Border]
-        Padding=0,0,0,0
-        CornerRadius=4,4,4,4
-        BorderThickness=1,1,1,1
-        BorderBrush=#0F000000
-        Background=#B3FFFFFF
-        Name=Background
-        MinWidth=64
-        Margin=0,0,0,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=64,32
-    [Windows.UI.Xaml.Controls.Border]
-        Padding=0,0,0,0
-        CornerRadius=4,4,4,4
-        BorderThickness=1,1,1,1
-        BorderBrush=#0F000000
-        Background=#0A000000
-        Name=HighlightBackground
-        Margin=0,0,0,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=64,32
-    [Windows.UI.Xaml.Controls.ContentPresenter]
-        Foreground=#E4000000
-        Padding=0,0,0,0
-        CornerRadius=0,0,0,0
-        BorderThickness=0,0,0,0
-        BorderBrush=[NULL]
-        Background=[NULL]
-        Name=ContentPresenter
-        Margin=12,5,0,7
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=20,20
-      [Windows.UI.Xaml.Controls.TextBlock]
-          Padding=0,0,0,0
-          Foreground=#93000000
-          Name=PlaceholderTextBlock
-          Margin=0,0,0,0
-          FocusVisualSecondaryThickness=1,1,1,1
-          FocusVisualSecondaryBrush=#99FFFFFF
-          FocusVisualPrimaryThickness=2,2,2,2
-          FocusVisualPrimaryBrush=#FF000000
-          Visibility=Visible
-          RenderSize=20,20
-    [Windows.UI.Xaml.Controls.FontIcon]
-        Foreground=#93000000
-        Name=DropDownGlyph
-        MinHeight=32
-        Margin=0,0,10,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=12,32
-      [Windows.UI.Xaml.Controls.Grid]
-          Padding=0,0,0,0
-          CornerRadius=0,0,0,0
-          BorderThickness=0,0,0,0
-          BorderBrush=[NULL]
-          Background=#00000000
-          Margin=0,0,0,0
-          FocusVisualSecondaryThickness=1,1,1,1
-          FocusVisualSecondaryBrush=#99FFFFFF
-          FocusVisualPrimaryThickness=2,2,2,2
-          FocusVisualPrimaryBrush=#FF000000
-          Visibility=Visible
-          RenderSize=12,32
-        [Windows.UI.Xaml.Controls.TextBlock]
-            Padding=0,0,0,0
-            Foreground=#93000000
-            Margin=0,0,0,0
-            FocusVisualSecondaryThickness=1,1,1,1
-            FocusVisualSecondaryBrush=#99FFFFFF
-            FocusVisualPrimaryThickness=2,2,2,2
-            FocusVisualPrimaryBrush=#FF000000
-            Visibility=Visible
-            RenderSize=12,12
-    [Windows.UI.Xaml.Controls.Primitives.Popup]
-        Name=Popup
-        Margin=0,0,0,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=32,0
diff --git a/test/MUXControlsTestApp/verification/ComboBox-6.xml b/test/MUXControlsTestApp/verification/ComboBox-6.xml
deleted file mode 100644
index d92ce09145..0000000000
--- a/test/MUXControlsTestApp/verification/ComboBox-6.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-[Windows.UI.Xaml.Controls.ComboBox]
-    Padding=12,5,0,7
-    Foreground=#E4000000
-    BorderThickness=1,1,1,1
-    BorderBrush=#0F000000
-    Background=#B3FFFFFF
-    MinWidth=64
-    Margin=0,0,0,0
-    FocusVisualSecondaryThickness=1,1,1,1
-    FocusVisualSecondaryBrush=#99FFFFFF
-    FocusVisualPrimaryThickness=2,2,2,2
-    FocusVisualPrimaryBrush=#FF000000
-    Visibility=Visible
-    RenderSize=64,32
-  [Windows.UI.Xaml.Controls.Grid]
-      Padding=0,0,0,0
-      CornerRadius=0,0,0,0
-      BorderThickness=0,0,0,0
-      BorderBrush=[NULL]
-      Background=[NULL]
-      Name=LayoutRoot
-      Margin=0,0,0,0
-      FocusVisualSecondaryThickness=1,1,1,1
-      FocusVisualSecondaryBrush=#99FFFFFF
-      FocusVisualPrimaryThickness=2,2,2,2
-      FocusVisualPrimaryBrush=#FF000000
-      Visibility=Visible
-      RenderSize=64,32
-    [Windows.UI.Xaml.Controls.Border]
-        Padding=0,0,0,0
-        CornerRadius=4,4,4,4
-        BorderThickness=1,1,1,1
-        BorderBrush=#0F000000
-        Background=#B3FFFFFF
-        Name=Background
-        MinWidth=64
-        Margin=0,0,0,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=64,32
-    [Windows.UI.Xaml.Controls.Border]
-        Padding=0,0,0,0
-        CornerRadius=4,4,4,4
-        BorderThickness=1,1,1,1
-        BorderBrush=#0F000000
-        Background=#0A000000
-        Name=HighlightBackground
-        Margin=0,0,0,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=64,32
-    [Windows.UI.Xaml.Controls.ContentPresenter]
-        Foreground=#E4000000
-        Padding=0,0,0,0
-        CornerRadius=0,0,0,0
-        BorderThickness=0,0,0,0
-        BorderBrush=[NULL]
-        Background=[NULL]
-        Name=ContentPresenter
-        Margin=12,5,0,7
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=20,20
-      [Windows.UI.Xaml.Controls.TextBlock]
-          Padding=0,0,0,0
-          Foreground=#93000000
-          Name=PlaceholderTextBlock
-          Margin=0,0,0,0
-          FocusVisualSecondaryThickness=1,1,1,1
-          FocusVisualSecondaryBrush=#99FFFFFF
-          FocusVisualPrimaryThickness=2,2,2,2
-          FocusVisualPrimaryBrush=#FF000000
-          Visibility=Visible
-          RenderSize=20,20
-    [Windows.UI.Xaml.Controls.FontIcon]
-        Foreground=#93000000
-        Name=DropDownGlyph
-        MinHeight=32
-        Margin=0,0,10,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=12,32
-      [Windows.UI.Xaml.Controls.Grid]
-          Padding=0,0,0,0
-          CornerRadius=0,0,0,0
-          BorderThickness=0,0,0,0
-          BorderBrush=[NULL]
-          Background=#00000000
-          Margin=0,0,0,0
-          FocusVisualSecondaryThickness=1,1,1,1
-          FocusVisualSecondaryBrush=#99FFFFFF
-          FocusVisualPrimaryThickness=2,2,2,2
-          FocusVisualPrimaryBrush=#FF000000
-          Visibility=Visible
-          RenderSize=12,32
-        [Windows.UI.Xaml.Controls.TextBlock]
-            Padding=0,0,0,0
-            Foreground=#93000000
-            Margin=0,0,0,0
-            FocusVisualSecondaryThickness=1,1,1,1
-            FocusVisualSecondaryBrush=#99FFFFFF
-            FocusVisualPrimaryThickness=2,2,2,2
-            FocusVisualPrimaryBrush=#FF000000
-            Visibility=Visible
-            RenderSize=12,12
-    [Windows.UI.Xaml.Controls.Primitives.Popup]
-        Name=Popup
-        Margin=0,0,0,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=32,0
diff --git a/test/MUXControlsTestApp/verification/ComboBox-7.xml b/test/MUXControlsTestApp/verification/ComboBox-7.xml
old mode 100644
new mode 100755
index 2673201930..5a368d8142
--- a/test/MUXControlsTestApp/verification/ComboBox-7.xml
+++ b/test/MUXControlsTestApp/verification/ComboBox-7.xml
@@ -2,7 +2,7 @@
     Padding=12,5,0,7
     Foreground=#E4000000
     BorderThickness=1,1,1,1
-    BorderBrush=#0F000000
+    BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
     Background=#B3FFFFFF
     CornerRadius=4,4,4,4
     Margin=0,0,0,0
@@ -28,26 +28,26 @@
       RenderSize=64,32
     [Windows.UI.Xaml.Controls.Border]
         Padding=0,0,0,0
-        CornerRadius=4,4,4,4
-        BorderThickness=1,1,1,1
-        BorderBrush=#0F000000
+        CornerRadius=7,7,7,7
+        BorderThickness=2,2,2,2
+        BorderBrush=#E4000000
         Background=#B3FFFFFF
-        Name=Background
-        MinWidth=64
-        Margin=0,0,0,0
+        Name=HighlightBackground
+        Margin=-4,-4,-4,-4
         FocusVisualSecondaryThickness=1,1,1,1
         FocusVisualSecondaryBrush=#99FFFFFF
         FocusVisualPrimaryThickness=2,2,2,2
         FocusVisualPrimaryBrush=#FF000000
         Visibility=Visible
-        RenderSize=64,32
+        RenderSize=72,40
     [Windows.UI.Xaml.Controls.Border]
         Padding=0,0,0,0
         CornerRadius=4,4,4,4
         BorderThickness=1,1,1,1
-        BorderBrush=#0F000000
-        Background=#0A000000
-        Name=HighlightBackground
+        BorderBrush=Windows.UI.Xaml.Media.LinearGradientBrush
+        Background=#B3FFFFFF
+        Name=Background
+        MinWidth=64
         Margin=0,0,0,0
         FocusVisualSecondaryThickness=1,1,1,1
         FocusVisualSecondaryBrush=#99FFFFFF
@@ -55,6 +55,18 @@
         FocusVisualPrimaryBrush=#FF000000
         Visibility=Visible
         RenderSize=64,32
+    [Windows.UI.Xaml.Shapes.Rectangle]
+        StrokeThickness=1
+        Width=3
+        Name=Pill
+        Margin=1,0,0,0
+        Height=16
+        FocusVisualSecondaryThickness=1,1,1,1
+        FocusVisualSecondaryBrush=#99FFFFFF
+        FocusVisualPrimaryThickness=2,2,2,2
+        FocusVisualPrimaryBrush=#FF000000
+        Visibility=Visible
+        RenderSize=3,16
     [Windows.UI.Xaml.Controls.ContentPresenter]
         Foreground=#E4000000
         Padding=0,0,0,0
@@ -98,13 +110,13 @@
         RenderSize=0,0
     [Windows.UI.Xaml.Controls.Border]
         Padding=0,0,0,0
-        CornerRadius=0,0,0,0
+        CornerRadius=4,4,4,4
         BorderThickness=0,0,0,0
         BorderBrush=[NULL]
         Background=#00FFFFFF
         Width=30
         Name=DropDownOverlay
-        Margin=0,1,1,1
+        Margin=-4,4,4,4
         FocusVisualSecondaryThickness=1,1,1,1
         FocusVisualSecondaryBrush=#99FFFFFF
         FocusVisualPrimaryThickness=2,2,2,2
@@ -115,7 +127,7 @@
         Foreground=#93000000
         Name=DropDownGlyph
         MinHeight=32
-        Margin=0,0,10,0
+        Margin=0,0,14,0
         FocusVisualSecondaryThickness=1,1,1,1
         FocusVisualSecondaryBrush=#99FFFFFF
         FocusVisualPrimaryThickness=2,2,2,2
diff --git a/test/MUXControlsTestApp/verification/ComboBox-8.xml b/test/MUXControlsTestApp/verification/ComboBox-8.xml
deleted file mode 100644
index 2673201930..0000000000
--- a/test/MUXControlsTestApp/verification/ComboBox-8.xml
+++ /dev/null
@@ -1,171 +0,0 @@
-[Windows.UI.Xaml.Controls.ComboBox]
-    Padding=12,5,0,7
-    Foreground=#E4000000
-    BorderThickness=1,1,1,1
-    BorderBrush=#0F000000
-    Background=#B3FFFFFF
-    CornerRadius=4,4,4,4
-    Margin=0,0,0,0
-    FocusVisualSecondaryThickness=1,1,1,1
-    FocusVisualSecondaryBrush=#99FFFFFF
-    FocusVisualPrimaryThickness=2,2,2,2
-    FocusVisualPrimaryBrush=#FF000000
-    Visibility=Visible
-    RenderSize=64,32
-  [Windows.UI.Xaml.Controls.Grid]
-      Padding=0,0,0,0
-      CornerRadius=0,0,0,0
-      BorderThickness=0,0,0,0
-      BorderBrush=[NULL]
-      Background=[NULL]
-      Name=LayoutRoot
-      Margin=0,0,0,0
-      FocusVisualSecondaryThickness=1,1,1,1
-      FocusVisualSecondaryBrush=#99FFFFFF
-      FocusVisualPrimaryThickness=2,2,2,2
-      FocusVisualPrimaryBrush=#FF000000
-      Visibility=Visible
-      RenderSize=64,32
-    [Windows.UI.Xaml.Controls.Border]
-        Padding=0,0,0,0
-        CornerRadius=4,4,4,4
-        BorderThickness=1,1,1,1
-        BorderBrush=#0F000000
-        Background=#B3FFFFFF
-        Name=Background
-        MinWidth=64
-        Margin=0,0,0,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=64,32
-    [Windows.UI.Xaml.Controls.Border]
-        Padding=0,0,0,0
-        CornerRadius=4,4,4,4
-        BorderThickness=1,1,1,1
-        BorderBrush=#0F000000
-        Background=#0A000000
-        Name=HighlightBackground
-        Margin=0,0,0,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=64,32
-    [Windows.UI.Xaml.Controls.ContentPresenter]
-        Foreground=#E4000000
-        Padding=0,0,0,0
-        CornerRadius=0,0,0,0
-        BorderThickness=0,0,0,0
-        BorderBrush=[NULL]
-        Background=[NULL]
-        Name=ContentPresenter
-        Margin=12,5,0,7
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=20,19
-      [Windows.UI.Xaml.Controls.TextBlock]
-          Padding=0,0,0,0
-          Foreground=#93000000
-          Name=PlaceholderTextBlock
-          Margin=0,0,0,0
-          FocusVisualSecondaryThickness=1,1,1,1
-          FocusVisualSecondaryBrush=#99FFFFFF
-          FocusVisualPrimaryThickness=2,2,2,2
-          FocusVisualPrimaryBrush=#FF000000
-          Visibility=Visible
-          RenderSize=20,19
-    [Windows.UI.Xaml.Controls.TextBox]
-        Padding=11,5,32,6
-        Foreground=#93000000
-        BorderThickness=1,1,1,1
-        BorderBrush=#00FFFFFF
-        Background=#B3FFFFFF
-        CornerRadius=4,4,4,4
-        Name=EditableText
-        Margin=0,0,0,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Collapsed
-        RenderSize=0,0
-    [Windows.UI.Xaml.Controls.Border]
-        Padding=0,0,0,0
-        CornerRadius=0,0,0,0
-        BorderThickness=0,0,0,0
-        BorderBrush=[NULL]
-        Background=#00FFFFFF
-        Width=30
-        Name=DropDownOverlay
-        Margin=0,1,1,1
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Collapsed
-        RenderSize=0,0
-    [Windows.UI.Xaml.Controls.FontIcon]
-        Foreground=#93000000
-        Name=DropDownGlyph
-        MinHeight=32
-        Margin=0,0,10,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=12,32
-      [Windows.UI.Xaml.Controls.Grid]
-          Padding=0,0,0,0
-          CornerRadius=0,0,0,0
-          BorderThickness=0,0,0,0
-          BorderBrush=[NULL]
-          Background=#00000000
-          Margin=0,0,0,0
-          FocusVisualSecondaryThickness=1,1,1,1
-          FocusVisualSecondaryBrush=#99FFFFFF
-          FocusVisualPrimaryThickness=2,2,2,2
-          FocusVisualPrimaryBrush=#FF000000
-          Visibility=Visible
-          RenderSize=12,32
-        [Windows.UI.Xaml.Controls.TextBlock]
-            Padding=0,0,0,0
-            Foreground=#93000000
-            Margin=0,0,0,0
-            FocusVisualSecondaryThickness=1,1,1,1
-            FocusVisualSecondaryBrush=#99FFFFFF
-            FocusVisualPrimaryThickness=2,2,2,2
-            FocusVisualPrimaryBrush=#FF000000
-            Visibility=Visible
-            RenderSize=12,12
-    [Windows.UI.Xaml.Controls.ContentPresenter]
-        Foreground=#99000000
-        Padding=0,0,0,0
-        CornerRadius=0,0,0,0
-        BorderThickness=0,0,0,0
-        BorderBrush=[NULL]
-        Background=[NULL]
-        Name=DescriptionPresenter
-        Margin=0,0,0,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=64,0
-    [Windows.UI.Xaml.Controls.Primitives.Popup]
-        Name=Popup
-        Margin=0,0,0,0
-        FocusVisualSecondaryThickness=1,1,1,1
-        FocusVisualSecondaryBrush=#99FFFFFF
-        FocusVisualPrimaryThickness=2,2,2,2
-        FocusVisualPrimaryBrush=#FF000000
-        Visibility=Visible
-        RenderSize=32,0