From d5e6a007a34cbfb8d2c331a8033106bb443fb4e7 Mon Sep 17 00:00:00 2001
From: Learner <vivek.gurukul1982@gmail.com>
Date: Wed, 31 Mar 2021 12:02:37 -0700
Subject: [PATCH] InkToolbar Style updates (#4507)

* Style updates

* Style updates

* Updated Buttons Width and Height

* Style updates: Added Margin to buttons, removed pill, added chevron back

* Flyout style updates

* Remove unused InkToolbarFlyoutL3PreviewPen Color

* Fixed Color and Size of chevron

* Improved margin, changed the chevron color

* Added flyout item pill hover color

* Margin changes

* Margin changes

* Changed the size from 40 px to 36 px

* Added Contract7Present for CornerRadius

* Removed stray spaces

* Added word Foreground to Accent colors

* Removed commented margin

* Removed InkToolbarSelectionAccentStyle and it's references

* Merged two visual state groups to one

* Changed RadiusX from 8 to 1.5

* Added vertical inkToolbar test

* Added vertical support and opening flyout tests

* Removed unused code

* Changed CurrentSelectionIcon.Opacity to 0 from 1 in disabled state

* Removed unused code

* Removed ambiguous test

* Updated InkToolbarButtonContentSize to InkToolbarButtonFontSize

* Using StaticResource instead of ThemeResource

* Added open flyout test and vertical inktoolbar test

* Added contract7Present API before CornerRadius

* Removed ShowExtensionGlyph visualStateGroups

* Margin updates

* Corrected Typos in InkToolbarButtonSelectedBackgroundPointerOver Resource key

Co-authored-by: Vivek Sharma <vivsha@microsoft.com>
---
 .../InkToolbar_themeresources.xaml            | 1092 +++++++++--------
 .../InteractionTests/CommonStylesTests.cs     |    8 +
 dev/CommonStyles/TestUI/InkToolbarPage.xaml   |   18 +-
 3 files changed, 574 insertions(+), 544 deletions(-)

diff --git a/dev/CommonStyles/InkToolbar_themeresources.xaml b/dev/CommonStyles/InkToolbar_themeresources.xaml
index b4d780f7b7..beda6a1b17 100644
--- a/dev/CommonStyles/InkToolbar_themeresources.xaml
+++ b/dev/CommonStyles/InkToolbar_themeresources.xaml
@@ -1,114 +1,115 @@
 <!-- Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT License. See LICENSE in the project root for license information. -->
 <ResourceDictionary
-    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:contract7Present="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
     <ResourceDictionary.ThemeDictionaries>
         <ResourceDictionary x:Key="Default">
-            <StaticResource x:Key="InkToolbarButtonWidth" ResourceKey="AppBarThemeCompactHeight" />
-            <StaticResource x:Key="InkToolbarButtonHeight" ResourceKey="AppBarThemeCompactHeight" />
-            <x:Double x:Key="InkToolbarButtonContentSize">16</x:Double>
-            <SolidColorBrush x:Key="InkToolbarButtonBackgroundThemeBrush" Color="{ThemeResource SystemChromeMediumColor}" />
-            <SolidColorBrush x:Key="InkToolbarButtonForegroundThemeBrush" Color="{ThemeResource SystemBaseHighColor}" />
-            <SolidColorBrush x:Key="InkToolbarFlyoutItemBackgroundThemeBrush" Color="{ThemeResource SystemChromeMediumLowColor}" />
-            <SolidColorBrush x:Key="InkToolbarFlyoutItemForegroundThemeBrush" Color="{ThemeResource SystemBaseHighColor}" />
-            <SolidColorBrush x:Key="InkToolbarButtonHoverBackgroundThemeBrush" Color="{ThemeResource SystemListLowColor}" />
-            <SolidColorBrush x:Key="InkToolbarButtonHoverForegroundThemeBrush" Color="{ThemeResource SystemBaseHighColor}" />
-            <SolidColorBrush x:Key="InkToolbarFlyoutItemHoverBackgroundThemeBrush" Color="{ThemeResource SystemListLowColor}" />
-            <SolidColorBrush x:Key="InkToolbarFlyoutItemHoverForegroundThemeBrush" Color="{ThemeResource SystemBaseHighColor}" />
-            <SolidColorBrush x:Key="InkToolbarButtonSelectedBackgroundThemeBrush" Color="{ThemeResource SystemChromeMediumColor}" />
-            <SolidColorBrush x:Key="InkToolbarButtonSelectedForegroundThemeBrush" Color="{ThemeResource SystemBaseHighColor}" />
-            <SolidColorBrush x:Key="InkToolbarButtonPressedBackgroundThemeBrush" Color="{ThemeResource SystemListLowColor}" />
-            <SolidColorBrush x:Key="InkToolbarButtonPressedForegroundThemeBrush" Color="{ThemeResource SystemBaseHighColor}" />
-            <SolidColorBrush x:Key="InkToolbarFlyoutItemPressedBackgroundThemeBrush" Color="{ThemeResource SystemListMediumColor}" />
-            <SolidColorBrush x:Key="InkToolbarFlyoutItemPressedForegroundThemeBrush" Color="{ThemeResource SystemBaseHighColor}" />
-            <SolidColorBrush x:Key="InkToolbarFlyoutItemPressedSelectedBackgroundThemeBrush" Color="{ThemeResource SystemControlHighlightListAccentHighBrush}" />
-            <SolidColorBrush x:Key="InkToolbarDisabledBackgroundThemeBrush" Color="{ThemeResource SystemChromeMediumColor}" />
-            <SolidColorBrush x:Key="InkToolbarDisabledForegroundThemeBrush" Color="{ThemeResource SystemBaseMediumLowColor}" />
-            <SolidColorBrush x:Key="InkToolbarAccentColorThemeBrush" Color="{ThemeResource SystemAccentColor}" />
-            <SolidColorBrush x:Key="InkToolbarFlyoutItemBorderHoverThemeBrush" Color="{ThemeResource SystemBaseMediumLowColor}" />
-            <SolidColorBrush x:Key="InkToolbarFlyoutItemBorderSelectedThemeBrush" Color="{ThemeResource SystemBaseHighColor}" />
-            <SolidColorBrush x:Key="InkToolbarFlyoutItemBorderPressedThemeBrush" Color="{ThemeResource SystemBaseHighColor}" />
-            <SolidColorBrush x:Key="InkToolbarFlyoutL3PreviewPen" Color="{ThemeResource SystemBaseLowColor}" />
-            <StaticResource x:Key="InkToolbarFlyoutItemHoverSelectedBackgroundThemeBrush" ResourceKey="SystemControlHighlightListAccentMediumBrush" />
-            <StaticResource x:Key="InkToolbarFlyoutItemSelectedBackgroundThemeBrush" ResourceKey="SystemControlHighlightListAccentLowBrush" />
-            <StaticResource x:Key="InkToolbarFlyoutItemSelectedForegroundThemeBrush" ResourceKey="InkToolbarButtonSelectedForegroundThemeBrush" />
-            <!-- Reveal themes for InkToolbar-->
-            <!-- Background -->
-            <StaticResource x:Key="InkToolbarButtonBackground" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
-            <StaticResource x:Key="InkToolbarButtonBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
-            <StaticResource x:Key="InkToolbarButtonBackgroundPressed" ResourceKey="SystemControlHighlightListMediumRevealListLowBackgroundBrush" />
-            <StaticResource x:Key="InkToolbarButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
-            <!-- Foreground -->
-            <StaticResource x:Key="InkToolbarButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
-            <StaticResource x:Key="InkToolbarButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
-            <StaticResource x:Key="InkToolbarButtonForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
-            <StaticResource x:Key="InkToolbarButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+            <!--Background-->
+            <StaticResource x:Key="InkToolbarButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="InkToolbarButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonBackgroundDisabled" ResourceKey="ControlFillColorDisabledBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedBackground" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedBackgroundDisabled" ResourceKey="ControlFillColorDisabledBrush" />
+            <StaticResource x:Key="InkToolbarButtonPressedBackgroundThemeBrush" ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="InkToolbarDisabledBackgroundThemeBrush" ResourceKey="SystemColorButtonFaceColor" />
+            <StaticResource x:Key="InkToolbarDisabledForegroundThemeBrush" ResourceKey="SystemColorGrayTextColor" />
+            <StaticResource x:Key="InkToolbarFlyoutItemBackgroundThemeBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="InkToolbarFlyoutItemHoverBackgroundThemeBrush" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="InkToolbarFlyoutItemPressedBackgroundThemeBrush" ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="InkToolbarFlyoutItemPressedSelectedBackgroundThemeBrush" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="InkToolbarFlyoutItemHoverSelectedBackgroundThemeBrush" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="InkToolbarFlyoutItemSelectedBackgroundThemeBrush" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <!--Foreground-->
+            <StaticResource x:Key="InkToolbarButtonForeground" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedForeground" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
+            <StaticResource x:Key="InkToolbarButtonHoverForegroundThemeBrush" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedForegroundThemeBrush" ResourceKey="SystemColorButtonTextColor" />
+            <StaticResource x:Key="InkToolbarButtonPressedForegroundThemeBrush" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="InkToolbarFlyoutItemForegroundThemeBrush" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="InkToolbarFlyoutItemHoverForegroundThemeBrush" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="InkToolbarFlyoutItemPressedForegroundThemeBrush" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="InkToolbarFlyoutItemSelectedForegroundThemeBrush" ResourceKey="TextFillColorPrimaryBrush" />
             <!-- BorderBrush -->
-            <Thickness x:Key="InkToolbarButtonBorderThemeThickness">1</Thickness>
-            <StaticResource x:Key="InkToolbarButtonBorderBrush" ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
-            <StaticResource x:Key="InkToolbarButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentRevealListLowBorderBrush" />
-            <StaticResource x:Key="InkToolbarButtonBorderBrushPressed" ResourceKey="SystemControlTransparentRevealListLowBorderBrush" />
-            <StaticResource x:Key="InkToolbarButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+            <Thickness x:Key="InkToolbarButtonBorderThemeThickness">0</Thickness>
+            <StaticResource x:Key="InkToolbarButtonBorderBrush" ResourceKey="ControlElevationBorderBrush" />
+            <StaticResource x:Key="InkToolbarButtonBorderBrushPointerOver" ResourceKey="ControlElevationBorderBrush" />
+            <StaticResource x:Key="InkToolbarButtonBorderBrushPressed" ResourceKey="ControlStrokeColorDefaultBrush" />
+            <StaticResource x:Key="InkToolbarButtonBorderBrushDisabled" ResourceKey="ControlStrokeColorDefaultBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedBorderBrush" ResourceKey="ControlElevationBorderBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedBorderBrushPointerOver" ResourceKey="ControlElevationBorderBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedBorderBrushPressed" ResourceKey="ControlStrokeColorDefaultBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedBorderBrushDisabled" ResourceKey="ControlStrokeColorDefaultBrush" />
+            <StaticResource x:Key="InkToolbarFlyoutItemBorderHoverThemeBrush" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <SolidColorBrush x:Key="InkToolbarFlyoutItemBorderSelectedThemeBrush" Color="#FFFFFF" />
+            <StaticResource x:Key="InkToolbarFlyoutItemBorderPressedThemeBrush" ResourceKey="InkToolbarFlyoutItemBorderSelectedThemeBrush" />
+            <StaticResource x:Key="InkToolbarAccentColorForegroundThemeBrush" ResourceKey="AccentTextFillColorPrimaryBrush" />
+            <StaticResource x:Key="InkToolbarAccentHoverColorForegroundThemeBrush" ResourceKey="AccentTextFillColorSecondaryBrush" />
         </ResourceDictionary>
         <ResourceDictionary x:Key="Light">
-            <StaticResource x:Key="InkToolbarButtonWidth" ResourceKey="AppBarThemeCompactHeight" />
-            <StaticResource x:Key="InkToolbarButtonHeight" ResourceKey="AppBarThemeCompactHeight" />
-            <x:Double x:Key="InkToolbarButtonContentSize">16</x:Double>
-            <SolidColorBrush x:Key="InkToolbarButtonBackgroundThemeBrush" Color="{ThemeResource SystemChromeMediumColor}" />
-            <SolidColorBrush x:Key="InkToolbarButtonForegroundThemeBrush" Color="{ThemeResource SystemBaseHighColor}" />
-            <SolidColorBrush x:Key="InkToolbarFlyoutItemBackgroundThemeBrush" Color="{ThemeResource SystemChromeMediumLowColor}" />
-            <SolidColorBrush x:Key="InkToolbarFlyoutItemForegroundThemeBrush" Color="{ThemeResource SystemBaseHighColor}" />
-            <SolidColorBrush x:Key="InkToolbarButtonHoverBackgroundThemeBrush" Color="{ThemeResource SystemListLowColor}" />
-            <SolidColorBrush x:Key="InkToolbarButtonHoverForegroundThemeBrush" Color="{ThemeResource SystemBaseHighColor}" />
-            <SolidColorBrush x:Key="InkToolbarFlyoutItemHoverBackgroundThemeBrush" Color="{ThemeResource SystemListLowColor}" />
-            <SolidColorBrush x:Key="InkToolbarFlyoutItemHoverForegroundThemeBrush" Color="{ThemeResource SystemBaseHighColor}" />
-            <SolidColorBrush x:Key="InkToolbarButtonSelectedBackgroundThemeBrush" Color="{ThemeResource SystemChromeMediumColor}" />
-            <SolidColorBrush x:Key="InkToolbarButtonSelectedForegroundThemeBrush" Color="{ThemeResource SystemBaseHighColor}" />
-            <SolidColorBrush x:Key="InkToolbarButtonPressedBackgroundThemeBrush" Color="{ThemeResource SystemListLowColor}" />
-            <SolidColorBrush x:Key="InkToolbarButtonPressedForegroundThemeBrush" Color="{ThemeResource SystemBaseHighColor}" />
-            <SolidColorBrush x:Key="InkToolbarFlyoutItemPressedBackgroundThemeBrush" Color="{ThemeResource SystemListMediumColor}" />
-            <SolidColorBrush x:Key="InkToolbarFlyoutItemPressedForegroundThemeBrush" Color="{ThemeResource SystemBaseHighColor}" />
-            <SolidColorBrush x:Key="InkToolbarFlyoutItemPressedSelectedBackgroundThemeBrush" Color="{ThemeResource SystemControlHighlightListAccentHighBrush}" />
-            <SolidColorBrush x:Key="InkToolbarDisabledBackgroundThemeBrush" Color="{ThemeResource SystemChromeMediumColor}" />
-            <SolidColorBrush x:Key="InkToolbarDisabledForegroundThemeBrush" Color="{ThemeResource SystemBaseMediumLowColor}" />
-            <SolidColorBrush x:Key="InkToolbarAccentColorThemeBrush" Color="{ThemeResource SystemAccentColor}" />
-            <SolidColorBrush x:Key="InkToolbarFlyoutItemBorderHoverThemeBrush" Color="{ThemeResource SystemBaseMediumLowColor}" />
-            <SolidColorBrush x:Key="InkToolbarFlyoutItemBorderSelectedThemeBrush" Color="{ThemeResource SystemBaseHighColor}" />
-            <SolidColorBrush x:Key="InkToolbarFlyoutItemBorderPressedThemeBrush" Color="{ThemeResource SystemBaseHighColor}" />
-            <SolidColorBrush x:Key="InkToolbarFlyoutL3PreviewPen" Color="{ThemeResource SystemBaseLowColor}" />
-            <StaticResource x:Key="InkToolbarFlyoutItemHoverSelectedBackgroundThemeBrush" ResourceKey="SystemControlHighlightListAccentMediumBrush" />
-            <StaticResource x:Key="InkToolbarFlyoutItemSelectedBackgroundThemeBrush" ResourceKey="SystemControlHighlightListAccentLowBrush" />
-            <StaticResource x:Key="InkToolbarFlyoutItemSelectedForegroundThemeBrush" ResourceKey="InkToolbarButtonSelectedForegroundThemeBrush" />
-            <!-- Reveal themes for InkToolbar-->
-            <!-- Background -->
-            <StaticResource x:Key="InkToolbarButtonBackground" ResourceKey="SystemControlTransparentRevealBackgroundBrush" />
-            <StaticResource x:Key="InkToolbarButtonBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
-            <StaticResource x:Key="InkToolbarButtonBackgroundPressed" ResourceKey="SystemControlHighlightListMediumRevealListLowBackgroundBrush" />
-            <StaticResource x:Key="InkToolbarButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
-            <!-- Foreground -->
-            <StaticResource x:Key="InkToolbarButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
-            <StaticResource x:Key="InkToolbarButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
-            <StaticResource x:Key="InkToolbarButtonForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
-            <StaticResource x:Key="InkToolbarButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+            <!--Background-->
+            <StaticResource x:Key="InkToolbarButtonBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="InkToolbarButtonBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonBackgroundPressed" ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonBackgroundDisabled" ResourceKey="ControlFillColorDisabledBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedBackground" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedBackgroundPressed" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedBackgroundDisabled" ResourceKey="ControlFillColorDisabledBrush" />
+            <StaticResource x:Key="InkToolbarButtonPressedBackgroundThemeBrush" ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="InkToolbarDisabledBackgroundThemeBrush" ResourceKey="SystemColorButtonFaceColor" />
+            <StaticResource x:Key="InkToolbarDisabledForegroundThemeBrush" ResourceKey="SystemColorGrayTextColor" />
+            <StaticResource x:Key="InkToolbarFlyoutItemBackgroundThemeBrush" ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="InkToolbarFlyoutItemHoverBackgroundThemeBrush" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="InkToolbarFlyoutItemPressedBackgroundThemeBrush" ResourceKey="SubtleFillColorTertiaryBrush" />
+            <StaticResource x:Key="InkToolbarFlyoutItemPressedSelectedBackgroundThemeBrush" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="InkToolbarFlyoutItemHoverSelectedBackgroundThemeBrush" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="InkToolbarFlyoutItemSelectedBackgroundThemeBrush" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <!--Foreground-->
+            <StaticResource x:Key="InkToolbarButtonForeground" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedForeground" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedForegroundPointerOver" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedForegroundPressed" ResourceKey="TextFillColorSecondaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedForegroundDisabled" ResourceKey="TextFillColorDisabledBrush" />
+            <StaticResource x:Key="InkToolbarButtonHoverForegroundThemeBrush" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedForegroundThemeBrush" ResourceKey="SystemColorButtonTextColor" />
+            <StaticResource x:Key="InkToolbarButtonPressedForegroundThemeBrush" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="InkToolbarFlyoutItemForegroundThemeBrush" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="InkToolbarFlyoutItemHoverForegroundThemeBrush" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="InkToolbarFlyoutItemPressedForegroundThemeBrush" ResourceKey="TextFillColorPrimaryBrush" />
+            <StaticResource x:Key="InkToolbarFlyoutItemSelectedForegroundThemeBrush" ResourceKey="TextFillColorPrimaryBrush" />
             <!-- BorderBrush -->
-            <Thickness x:Key="InkToolbarButtonBorderThemeThickness">1</Thickness>
-            <StaticResource x:Key="InkToolbarButtonBorderBrush" ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
-            <StaticResource x:Key="InkToolbarButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentRevealListLowBorderBrush" />
-            <StaticResource x:Key="InkToolbarButtonBorderBrushPressed" ResourceKey="SystemControlTransparentRevealListLowBorderBrush" />
-            <StaticResource x:Key="InkToolbarButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+            <Thickness x:Key="InkToolbarButtonBorderThemeThickness">0</Thickness>
+            <StaticResource x:Key="InkToolbarButtonBorderBrush" ResourceKey="ControlElevationBorderBrush" />
+            <StaticResource x:Key="InkToolbarButtonBorderBrushPointerOver" ResourceKey="ControlElevationBorderBrush" />
+            <StaticResource x:Key="InkToolbarButtonBorderBrushPressed" ResourceKey="ControlStrokeColorDefaultBrush" />
+            <StaticResource x:Key="InkToolbarButtonBorderBrushDisabled" ResourceKey="ControlStrokeColorDefaultBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedBorderBrush" ResourceKey="ControlElevationBorderBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedBorderBrushPointerOver" ResourceKey="ControlElevationBorderBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedBorderBrushPressed" ResourceKey="ControlStrokeColorDefaultBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedBorderBrushDisabled" ResourceKey="ControlStrokeColorDefaultBrush" />
+            <StaticResource x:Key="InkToolbarFlyoutItemBorderHoverThemeBrush" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <SolidColorBrush x:Key="InkToolbarFlyoutItemBorderSelectedThemeBrush" Color="#000000" />
+            <StaticResource x:Key="InkToolbarFlyoutItemBorderPressedThemeBrush" ResourceKey="InkToolbarFlyoutItemBorderSelectedThemeBrush" />            
+            <StaticResource x:Key="InkToolbarAccentColorForegroundThemeBrush" ResourceKey="AccentTextFillColorPrimaryBrush" />
+            <StaticResource x:Key="InkToolbarAccentHoverColorForegroundThemeBrush" ResourceKey="AccentTextFillColorSecondaryBrush" />
         </ResourceDictionary>
         <ResourceDictionary x:Key="HighContrast">
-            <StaticResource x:Key="InkToolbarButtonWidth" ResourceKey="AppBarThemeCompactHeight" />
-            <StaticResource x:Key="InkToolbarButtonHeight" ResourceKey="AppBarThemeCompactHeight" />
-            <x:Double x:Key="InkToolbarButtonContentSize">16</x:Double>
-            <SolidColorBrush x:Key="InkToolbarButtonBackgroundThemeBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
-            <SolidColorBrush x:Key="InkToolbarButtonForegroundThemeBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
             <SolidColorBrush x:Key="InkToolbarFlyoutItemBackgroundThemeBrush" Color="{ThemeResource SystemColorWindowColor}" />
             <SolidColorBrush x:Key="InkToolbarFlyoutItemForegroundThemeBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
-            <SolidColorBrush x:Key="InkToolbarButtonHoverBackgroundThemeBrush" Color="{ThemeResource SystemColorHighlightColor}" />
             <SolidColorBrush x:Key="InkToolbarButtonHoverForegroundThemeBrush" Color="{ThemeResource SystemColorHighlightTextColor}" />
             <SolidColorBrush x:Key="InkToolbarFlyoutItemHoverBackgroundThemeBrush" Color="{ThemeResource SystemColorHighlightColor}" />
             <SolidColorBrush x:Key="InkToolbarFlyoutItemHoverForegroundThemeBrush" Color="{ThemeResource SystemColorHighlightTextColor}" />
-            <SolidColorBrush x:Key="InkToolbarButtonSelectedBackgroundThemeBrush" Color="{ThemeResource SystemColorHighlightColor}" />
             <SolidColorBrush x:Key="InkToolbarButtonSelectedForegroundThemeBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
             <SolidColorBrush x:Key="InkToolbarButtonPressedBackgroundThemeBrush" Color="{ThemeResource SystemColorHighlightColor}" />
             <SolidColorBrush x:Key="InkToolbarButtonPressedForegroundThemeBrush" Color="{ThemeResource SystemColorHighlightTextColor}" />
@@ -117,11 +118,11 @@
             <SolidColorBrush x:Key="InkToolbarFlyoutItemPressedSelectedBackgroundThemeBrush" Color="{ThemeResource SystemColorHighlightColor}" />
             <SolidColorBrush x:Key="InkToolbarDisabledBackgroundThemeBrush" Color="{ThemeResource SystemColorButtonFaceColor}" />
             <SolidColorBrush x:Key="InkToolbarDisabledForegroundThemeBrush" Color="{ThemeResource SystemColorGrayTextColor}" />
-            <SolidColorBrush x:Key="InkToolbarAccentColorThemeBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
+            <SolidColorBrush x:Key="InkToolbarAccentColorForegroundThemeBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
+            <StaticResource x:Key="InkToolbarAccentHoverColorForegroundThemeBrush" ResourceKey="AccentTextFillColorSecondaryBrush" />
             <SolidColorBrush x:Key="InkToolbarFlyoutItemBorderHoverThemeBrush" Color="{ThemeResource SystemColorWindowTextColor}" />
             <SolidColorBrush x:Key="InkToolbarFlyoutItemBorderSelectedThemeBrush" Color="{ThemeResource SystemColorButtonTextColor}" />
             <SolidColorBrush x:Key="InkToolbarFlyoutItemBorderPressedThemeBrush" Color="{ThemeResource SystemColorHighlightColor}" />
-            <SolidColorBrush x:Key="InkToolbarFlyoutL3PreviewPen" Color="{ThemeResource SystemColorWindowTextColor}" />
             <StaticResource x:Key="InkToolbarFlyoutItemHoverSelectedBackgroundThemeBrush" ResourceKey="InkToolbarFlyoutItemHoverBackgroundThemeBrush" />
             <StaticResource x:Key="InkToolbarFlyoutItemSelectedBackgroundThemeBrush" ResourceKey="InkToolbarButtonSelectedBackgroundThemeBrush" />
             <StaticResource x:Key="InkToolbarFlyoutItemSelectedForegroundThemeBrush" ResourceKey="InkToolbarButtonHoverForegroundThemeBrush" />
@@ -131,24 +132,43 @@
             <StaticResource x:Key="InkToolbarButtonBackgroundPointerOver" ResourceKey="SystemControlHighlightListLowRevealBackgroundBrush" />
             <StaticResource x:Key="InkToolbarButtonBackgroundPressed" ResourceKey="SystemControlHighlightListMediumRevealListLowBackgroundBrush" />
             <StaticResource x:Key="InkToolbarButtonBackgroundDisabled" ResourceKey="SystemControlTransparentBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedBackground" ResourceKey="SubtleFillColorTransparentBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedBackgroundPointerOver" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedBackgroundPressed" ResourceKey="SubtleFillColorSecondaryBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedBackgroundDisabled" ResourceKey="ControlFillColorDisabledBrush" />
             <!-- Foreground -->
             <StaticResource x:Key="InkToolbarButtonForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
             <StaticResource x:Key="InkToolbarButtonForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
             <StaticResource x:Key="InkToolbarButtonForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
             <StaticResource x:Key="InkToolbarButtonForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedForeground" ResourceKey="SystemControlForegroundBaseHighBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedForegroundPointerOver" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedForegroundPressed" ResourceKey="SystemControlHighlightAltBaseHighBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedForegroundDisabled" ResourceKey="SystemControlDisabledBaseMediumLowBrush" />
             <!-- BorderBrush -->
             <Thickness x:Key="InkToolbarButtonBorderThemeThickness">1</Thickness>
             <StaticResource x:Key="InkToolbarButtonBorderBrush" ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
             <StaticResource x:Key="InkToolbarButtonBorderBrushPointerOver" ResourceKey="SystemControlTransparentRevealListLowBorderBrush" />
             <StaticResource x:Key="InkToolbarButtonBorderBrushPressed" ResourceKey="SystemControlTransparentRevealListLowBorderBrush" />
             <StaticResource x:Key="InkToolbarButtonBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedBorderBrush" ResourceKey="SystemControlBackgroundTransparentRevealBorderBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedBorderBrushPointerOver" ResourceKey="SystemControlTransparentRevealListLowBorderBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedBorderBrushPressed" ResourceKey="SystemControlTransparentRevealListLowBorderBrush" />
+            <StaticResource x:Key="InkToolbarButtonSelectedBorderBrushDisabled" ResourceKey="SystemControlTransparentBrush" />
         </ResourceDictionary>
     </ResourceDictionary.ThemeDictionaries>
 
+    <x:Double x:Key="InkToolbarButtonWidth">36</x:Double>
+    <x:Double x:Key="InkToolbarButtonHeight">36</x:Double>
+    <x:Double x:Key="InkToolbarButtonFontSize">16</x:Double>
+    <Thickness x:Key="InkToolbarFlyoutPanelMargin">0,1,0,1</Thickness>
+    <Thickness x:Key="InkToolbarFlyoutItemIconMargin">12,0,12,0</Thickness>
+    <Thickness x:Key="InkToolbarFlyoutItemTextBlockMargin">0,0,12,0</Thickness>
+
     <Style x:Key="InkToolbarGlyphFontStyle" TargetType="TextBlock">
         <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
-        <Setter Property="FontSize" Value="{ThemeResource InkToolbarButtonContentSize}" />
-        <Setter Property="LineHeight" Value="{ThemeResource InkToolbarButtonContentSize}" />
+        <Setter Property="FontSize" Value="{StaticResource InkToolbarButtonFontSize}" />
+        <Setter Property="LineHeight" Value="{StaticResource InkToolbarButtonFontSize}" />
         <Setter Property="LineStackingStrategy" Value="BlockLineHeight" />
         <Setter Property="TextLineBounds" Value="Tight" />
         <Setter Property="TextAlignment" Value="Center" />
@@ -159,8 +179,8 @@
 
     <Style x:Key="InkToolbarGlyphFillFontStyle" TargetType="TextBlock">
         <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
-        <Setter Property="FontSize" Value="{ThemeResource InkToolbarButtonContentSize}" />
-        <Setter Property="LineHeight" Value="{ThemeResource InkToolbarButtonContentSize}" />
+        <Setter Property="FontSize" Value="{StaticResource InkToolbarButtonFontSize}" />
+        <Setter Property="LineHeight" Value="{StaticResource InkToolbarButtonFontSize}" />
         <Setter Property="LineStackingStrategy" Value="BlockLineHeight" />
         <Setter Property="TextLineBounds" Value="Tight" />
         <Setter Property="TextAlignment" Value="Center" />
@@ -171,38 +191,42 @@
 
     <Style x:Key="InkToolbarFlyoutStyle" TargetType="FlyoutPresenter">
         <Setter Property="Padding" Value="0,0,0,0" />
-        <Setter Property="Background" Value="{ThemeResource SystemControlBackgroundChromeMediumLowBrush}" />
-        <Setter Property="BorderBrush" Value="{ThemeResource SystemControlForegroundChromeHighBrush}" />
+        <Setter Property="Background" Value="{ThemeResource AcrylicBackgroundFillColorDefaultBrush}" />
+        <Setter Property="BorderBrush" Value="{ThemeResource SurfaceStrokeColorDefaultBrush}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="MinWidth" Value="0" />
         <Setter Property="MinHeight" Value="0" />
+        <Setter Property="Margin" Value="2,4,2,4" />
+        <contract7Present:Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
     </Style>
 
     <Style x:Key="InkToolbarCommonButtonStyle" TargetType="ToggleButton">
-        <Setter Property="MinWidth" Value="{ThemeResource InkToolbarButtonWidth}" />
-        <Setter Property="MinHeight" Value="{ThemeResource InkToolbarButtonHeight}" />
-        <Setter Property="MaxWidth" Value="{ThemeResource InkToolbarButtonWidth}" />
-        <Setter Property="MaxHeight" Value="{ThemeResource InkToolbarButtonHeight}" />
+        <Setter Property="MinWidth" Value="{StaticResource InkToolbarButtonWidth}" />
+        <Setter Property="MinHeight" Value="{StaticResource InkToolbarButtonHeight}" />
+        <Setter Property="MaxWidth" Value="{StaticResource InkToolbarButtonWidth}" />
+        <Setter Property="MaxHeight" Value="{StaticResource InkToolbarButtonHeight}" />
         <Setter Property="BorderThickness" Value="{ThemeResource InkToolbarButtonBorderThemeThickness}" />
         <Setter Property="Background" Value="{ThemeResource InkToolbarButtonBackground}" />
         <Setter Property="Foreground" Value="{ThemeResource InkToolbarButtonForeground}" />
         <Setter Property="BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrush}" />
         <Setter Property="UseSystemFocusVisuals" Value="True" />
         <Setter Property="FocusVisualMargin" Value="-3" />
-        <Setter Property="Padding" Value="0,0,0,0" />
+        <Setter Property="Padding" Value="2,2,2,2" />
+        <Setter Property="Margin" Value="2,2,2,2" />
+        <contract7Present:Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
     </Style>
 
     <Style x:Key="InkToolbarExtensionGlyphStyle" TargetType="TextBlock">
         <Setter Property="FontFamily" Value="{ThemeResource SymbolThemeFontFamily}" />
-        <Setter Property="FontSize" Value="8" />
-        <Setter Property="LineHeight" Value="8" />
+        <Setter Property="FontSize" Value="10" />
+        <Setter Property="LineHeight" Value="10" />
         <Setter Property="LineStackingStrategy" Value="BlockLineHeight" />
         <Setter Property="TextLineBounds" Value="Tight" />
         <Setter Property="TextAlignment" Value="Center" />
         <Setter Property="HorizontalAlignment" Value="Center" />
         <Setter Property="VerticalAlignment" Value="Bottom" />
-        <Setter Property="Margin" Value="0,0,0,2" />
-        <Setter Property="Foreground" Value="{ThemeResource InkToolbarAccentColorThemeBrush}" />
+        <Setter Property="Margin" Value="0,0,0,0" />
+        <Setter Property="Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
         <Setter Property="Opacity" Value="0" />
         <Setter Property="Text" Value="&#xE228;" />
         <Setter Property="HighContrastAdjustment" Value="None" />
@@ -214,11 +238,19 @@
         <Setter Property="HighContrastAdjustment" Value="None" />
     </Style>
 
-    <Style x:Key="InkToolbarSelectionAccentStyle" TargetType="Rectangle">
+    <Style x:Key="InkToolbarPenConfigurationControlTextStyle" TargetType="TextBlock" BasedOn="{StaticResource BodyTextBlockStyle}">
+        <Setter Property="FontWeight" Value="SemiBold" />
+    </Style>
+
+    <Style x:Key="InkToolbarFlyoutItemSelectionAccentStyle" TargetType="Rectangle">
         <Setter Property="Opacity" Value="0" />
-        <Setter Property="VerticalAlignment" Value="Bottom" />
-        <Setter Property="Height" Value="2" />
-        <Setter Property="Fill" Value="{ThemeResource InkToolbarAccentColorThemeBrush}" />
+        <Setter Property="VerticalAlignment" Value="Center" />
+        <Setter Property="HorizontalAlignment" Value="Left" />
+        <Setter Property="Height" Value="16" />
+        <Setter Property="Width" Value="3"/>
+        <Setter Property="Fill" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
+        <contract7Present:Setter Property="RadiusX" Value="1.5" />
+        <contract7Present:Setter Property="RadiusY" Value="1.5" />
     </Style>
 
     <!--The AttachedFlyout must be created from code behind, otherwise XAML will create *one* flyout for this style and
@@ -229,7 +261,7 @@
         <Setter Property="AutomationProperties.AutomationId" Value="InkToolbarBallpointPenButton" />
         <Setter Property="MinStrokeWidth" Value="1" />
         <Setter Property="MaxStrokeWidth" Value="24" />
-        <Setter Property="SelectedStrokeWidth" Value="4" />
+        <Setter Property="SelectedStrokeWidth" Value="2" />
         <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
         <Setter Property="SelectedBrushIndex" Value="0" />
         <Setter Property="Template">
@@ -237,8 +269,9 @@
                 <ControlTemplate TargetType="InkToolbarBallpointPenButton">
                     <Grid x:Name="RootElement"
                         Background="{TemplateBinding Background}"
-                        Width="{ThemeResource InkToolbarButtonWidth}"
-                        Height="{ThemeResource InkToolbarButtonHeight}">
+                        Width="{StaticResource InkToolbarButtonWidth}"
+                        Height="{StaticResource InkToolbarButtonHeight}"
+                        contract7Present:CornerRadius="{TemplateBinding CornerRadius}" >
 
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
@@ -246,23 +279,21 @@
 
                                 <VisualState x:Name="PointerOver">
                                     <VisualState.Setters>
-                                        <Setter Target="RootElement.(RevealBrush.State)" Value="PointerOver" />
                                         <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonBackgroundPointerOver}" />
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushPointerOver}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundPointerOver}" />
                                         <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonHoverForegroundThemeBrush}" />
-                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarButtonHoverForegroundThemeBrush}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
 
                                 <VisualState x:Name="Pressed">
                                     <VisualState.Setters>
-                                        <Setter Target="RootElement.(RevealBrush.State)" Value="Pressed" />
                                         <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonBackgroundPressed}" />
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushPressed}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundPressed}" />
                                         <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonPressedForegroundThemeBrush}" />
-                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarButtonPressedForegroundThemeBrush}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
 
@@ -272,39 +303,64 @@
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushDisabled}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundDisabled}" />
                                         <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarDisabledForegroundThemeBrush}" />
-                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarDisabledForegroundThemeBrush}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
 
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="CheckStates">
-                                <VisualState x:Name="Unchecked" />
-                                <VisualState x:Name="Indeterminate" />
-
                                 <VisualState x:Name="Checked">
                                     <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackground}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrush}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForeground}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForeground}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                         <Setter Target="Content.Opacity" Value="0" />
                                         <Setter Target="CheckedContent.Opacity" Value="1" />
-                                        <Setter Target="SelectionAccent.Opacity" Value="1" />
+                                        <Setter Target="ExtensionGlyph.Opacity" Value="1" />
                                     </VisualState.Setters>
                                 </VisualState>
 
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="FocusStates">
-                                <VisualState x:Name="Focused" />
-                                <VisualState x:Name="Unfocused" />
-                                <VisualState x:Name="PointerFocused" />
+                                <VisualState x:Name="CheckedPointerOver">
+                                    <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackgroundPointerOver}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrushPointerOver}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPointerOver}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPointerOver}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
+                                        <Setter Target="Content.Opacity" Value="0" />
+                                        <Setter Target="CheckedContent.Opacity" Value="1" />
+                                        <Setter Target="ExtensionGlyph.Opacity" Value="1" />
+                                    </VisualState.Setters>
+                                </VisualState>
 
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="GlyphVisualStates">
-                                <VisualState x:Name="ShowExtensionGlyph">
+                                <VisualState x:Name="CheckedPressed">
                                     <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackgroundPressed}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrushPressed}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPressed}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPressed}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
+                                        <Setter Target="Content.Opacity" Value="0" />
+                                        <Setter Target="CheckedContent.Opacity" Value="1" />
+                                        <Setter Target="ExtensionGlyph.Opacity" Value="1" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                                <VisualState x:Name="CheckedDisabled">
+                                    <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackgroundDisabled}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrushDisabled}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundDisabled}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundDisabled}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
+                                        <Setter Target="Content.Opacity" Value="0" />
+                                        <Setter Target="CheckedContent.Opacity" Value="1" />
                                         <Setter Target="ExtensionGlyph.Opacity" Value="1" />
                                     </VisualState.Setters>
                                 </VisualState>
-                                <VisualState x:Name="HideExtensionGlyph" />
 
                             </VisualStateGroup>
+
                             <VisualStateGroup x:Name="FlowDirectionStates">
                                 <VisualState x:Name="LeftToRight" />
                                 <VisualState x:Name="RightToLeft">
@@ -318,7 +374,6 @@
                                 <VisualState x:Name="BottomDirection" />
                                 <VisualState x:Name="TopDirection">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Bottom" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Top" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="0,2,0,0" />
@@ -327,10 +382,6 @@
                                 </VisualState>
                                 <VisualState x:Name="RightDirection">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Right" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Right" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="0,0,2,0" />
@@ -339,10 +390,6 @@
                                 </VisualState>
                                 <VisualState x:Name="LeftDirection">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Left" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Left" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="2,0,0,0" />
@@ -351,10 +398,6 @@
                                 </VisualState>
                                 <VisualState x:Name="RightDirectionRTL">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Right" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Right" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="0,0,2,0" />
@@ -363,10 +406,6 @@
                                 </VisualState>
                                 <VisualState x:Name="LeftDirectionRTL">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Left" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Left" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="2,0,0,0" />
@@ -391,7 +430,7 @@
                                 Text="&#xE76D;"
                                 AutomationProperties.AccessibilityView="Raw"
                                 Canvas.ZIndex="1"
-                                Foreground="{ThemeResource InkToolbarButtonForegroundThemeBrush}" />
+                                Foreground="{ThemeResource InkToolbarButtonForeground}" />
                             <TextBlock x:Name="CheckedContent"
                                 Style="{StaticResource InkToolbarGlyphFontStyle}"
                                 Text="&#xE76D;"
@@ -411,10 +450,10 @@
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 Grid.RowSpan="2" Grid.ColumnSpan="2"
-                                Margin="1,0"/>
+                                Margin="1,0"
+                                contract7Present:CornerRadius="{TemplateBinding CornerRadius}"/>
 
                         </Grid>
-                        <Rectangle x:Name="SelectionAccent" Style="{StaticResource InkToolbarSelectionAccentStyle}" />
 
                     </Grid>
 
@@ -439,8 +478,9 @@
                 <ControlTemplate TargetType="InkToolbarHighlighterButton">
                     <Grid x:Name="RootElement"
                         Background="{TemplateBinding Background}"
-                        Width="{ThemeResource InkToolbarButtonWidth}"
-                        Height="{ThemeResource InkToolbarButtonHeight}">
+                        Width="{StaticResource InkToolbarButtonWidth}"
+                        Height="{StaticResource InkToolbarButtonHeight}"
+                        contract7Present:CornerRadius="{TemplateBinding CornerRadius}">
 
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
@@ -448,23 +488,21 @@
 
                                 <VisualState x:Name="PointerOver">
                                     <VisualState.Setters>
-                                        <Setter Target="RootElement.(RevealBrush.State)" Value="PointerOver" />
                                         <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonBackgroundPointerOver}" />
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushPointerOver}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundPointerOver}" />
                                         <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonHoverForegroundThemeBrush}" />
-                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarButtonHoverForegroundThemeBrush}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
 
                                 <VisualState x:Name="Pressed">
                                     <VisualState.Setters>
-                                        <Setter Target="RootElement.(RevealBrush.State)" Value="Pressed" />
                                         <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonBackgroundPressed}" />
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushPressed}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundPressed}" />
                                         <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonPressedForegroundThemeBrush}" />
-                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarButtonPressedForegroundThemeBrush}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
 
@@ -474,39 +512,64 @@
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushDisabled}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundDisabled}" />
                                         <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarDisabledForegroundThemeBrush}" />
-                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarDisabledForegroundThemeBrush}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
 
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="CheckStates">
-                                <VisualState x:Name="Unchecked" />
-                                <VisualState x:Name="Indeterminate" />
-
                                 <VisualState x:Name="Checked">
                                     <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackground}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrush}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForeground}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForeground}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                         <Setter Target="Content.Opacity" Value="0" />
                                         <Setter Target="CheckedContent.Opacity" Value="1" />
-                                        <Setter Target="SelectionAccent.Opacity" Value="1" />
+                                        <Setter Target="ExtensionGlyph.Opacity" Value="1" />
                                     </VisualState.Setters>
                                 </VisualState>
 
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="FocusStates">
-                                <VisualState x:Name="Focused" />
-                                <VisualState x:Name="Unfocused" />
-                                <VisualState x:Name="PointerFocused" />
+                                <VisualState x:Name="CheckedPointerOver">
+                                    <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackgroundPointerOver}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrushPointerOver}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPointerOver}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPointerOver}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
+                                        <Setter Target="Content.Opacity" Value="0" />
+                                        <Setter Target="CheckedContent.Opacity" Value="1" />
+                                        <Setter Target="ExtensionGlyph.Opacity" Value="1" />
+                                    </VisualState.Setters>
+                                </VisualState>
 
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="GlyphVisualStates">
-                                <VisualState x:Name="ShowExtensionGlyph">
+                                <VisualState x:Name="CheckedPressed">
+                                    <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackgroundPressed}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrushPressed}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPressed}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPressed}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
+                                        <Setter Target="Content.Opacity" Value="0" />
+                                        <Setter Target="CheckedContent.Opacity" Value="1" />
+                                        <Setter Target="ExtensionGlyph.Opacity" Value="1" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                                <VisualState x:Name="CheckedDisabled">
                                     <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackgroundDisabled}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrushDisabled}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundDisabled}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundDisabled}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
+                                        <Setter Target="Content.Opacity" Value="0" />
+                                        <Setter Target="CheckedContent.Opacity" Value="1" />
                                         <Setter Target="ExtensionGlyph.Opacity" Value="1" />
                                     </VisualState.Setters>
                                 </VisualState>
-                                <VisualState x:Name="HideExtensionGlyph" />
 
                             </VisualStateGroup>
+
                             <VisualStateGroup x:Name="FlowDirectionStates">
                                 <VisualState x:Name="LeftToRight" />
                                 <VisualState x:Name="RightToLeft">
@@ -520,7 +583,6 @@
                                 <VisualState x:Name="BottomDirection" />
                                 <VisualState x:Name="TopDirection">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Bottom" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Top" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="0,2,0,0" />
@@ -529,10 +591,6 @@
                                 </VisualState>
                                 <VisualState x:Name="RightDirection">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Right" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Right" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="0,0,2,0" />
@@ -541,10 +599,6 @@
                                 </VisualState>
                                 <VisualState x:Name="LeftDirection">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Left" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Left" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="2,0,0,0" />
@@ -553,10 +607,6 @@
                                 </VisualState>
                                 <VisualState x:Name="RightDirectionRTL">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Right" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Right" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="0,0,2,0" />
@@ -565,10 +615,6 @@
                                 </VisualState>
                                 <VisualState x:Name="LeftDirectionRTL">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Left" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Left" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="2,0,0,0" />
@@ -592,7 +638,7 @@
                                 Text="&#xE193;"
                                 AutomationProperties.AccessibilityView="Raw"
                                 Canvas.ZIndex="1"
-                                Foreground="{ThemeResource InkToolbarButtonForegroundThemeBrush}" />
+                                Foreground="{ThemeResource InkToolbarButtonForeground}" />
                             <TextBlock x:Name="CheckedContent"
                                 Style="{StaticResource InkToolbarGlyphFontStyle}"
                                 Text="&#xE193;"
@@ -612,10 +658,10 @@
                                 BorderBrush="{TemplateBinding BorderBrush}"
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 Grid.RowSpan="2" Grid.ColumnSpan="2"
-                                Margin="1,0"/>
+                                Margin="1,0"
+                                contract7Present:CornerRadius="{TemplateBinding CornerRadius}"/>
 
                         </Grid>
-                        <Rectangle x:Name="SelectionAccent" Style="{StaticResource InkToolbarSelectionAccentStyle}" />
 
                     </Grid>
 
@@ -640,8 +686,9 @@
                 <ControlTemplate TargetType="InkToolbarPencilButton">
                     <Grid x:Name="RootElement"
                         Background="{TemplateBinding Background}"
-                        Width="{ThemeResource InkToolbarButtonWidth}"
-                        Height="{ThemeResource InkToolbarButtonHeight}">
+                        Width="{StaticResource InkToolbarButtonWidth}"
+                        Height="{StaticResource InkToolbarButtonHeight}"
+                        contract7Present:CornerRadius="{TemplateBinding CornerRadius}">
 
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
@@ -649,23 +696,21 @@
 
                                 <VisualState x:Name="PointerOver">
                                     <VisualState.Setters>
-                                        <Setter Target="RootElement.(RevealBrush.State)" Value="PointerOver" />
                                         <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonBackgroundPointerOver}" />
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushPointerOver}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundPointerOver}" />
                                         <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonHoverForegroundThemeBrush}" />
-                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarButtonHoverForegroundThemeBrush}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
 
                                 <VisualState x:Name="Pressed">
                                     <VisualState.Setters>
-                                        <Setter Target="RootElement.(RevealBrush.State)" Value="Pressed" />
                                         <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonBackgroundPressed}" />
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushPressed}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundPressed}" />
                                         <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonPressedForegroundThemeBrush}" />
-                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarButtonPressedForegroundThemeBrush}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
 
@@ -675,39 +720,64 @@
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushDisabled}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundDisabled}" />
                                         <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarDisabledForegroundThemeBrush}" />
-                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarDisabledForegroundThemeBrush}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
 
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="CheckStates">
-                                <VisualState x:Name="Unchecked" />
-                                <VisualState x:Name="Indeterminate" />
-
                                 <VisualState x:Name="Checked">
                                     <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackground}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrush}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForeground}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForeground}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                         <Setter Target="Content.Opacity" Value="0" />
                                         <Setter Target="CheckedContent.Opacity" Value="1" />
-                                        <Setter Target="SelectionAccent.Opacity" Value="1" />
+                                        <Setter Target="ExtensionGlyph.Opacity" Value="1" />
                                     </VisualState.Setters>
                                 </VisualState>
 
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="FocusStates">
-                                <VisualState x:Name="Focused" />
-                                <VisualState x:Name="Unfocused" />
-                                <VisualState x:Name="PointerFocused" />
+                                <VisualState x:Name="CheckedPointerOver">
+                                    <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackgroundPointerOver}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrushPointerOver}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPointerOver}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPointerOver}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
+                                        <Setter Target="Content.Opacity" Value="0" />
+                                        <Setter Target="CheckedContent.Opacity" Value="1" />
+                                        <Setter Target="ExtensionGlyph.Opacity" Value="1" />
+                                    </VisualState.Setters>
+                                </VisualState>
 
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="GlyphVisualStates">
-                                <VisualState x:Name="ShowExtensionGlyph">
+                                <VisualState x:Name="CheckedPressed">
                                     <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackgroundPressed}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrushPressed}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPressed}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPressed}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
+                                        <Setter Target="Content.Opacity" Value="0" />
+                                        <Setter Target="CheckedContent.Opacity" Value="1" />
+                                        <Setter Target="ExtensionGlyph.Opacity" Value="1" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                                <VisualState x:Name="CheckedDisabled">
+                                    <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackgroundDisabled}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrushDisabled}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundDisabled}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundDisabled}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
+                                        <Setter Target="Content.Opacity" Value="0" />
+                                        <Setter Target="CheckedContent.Opacity" Value="1" />
                                         <Setter Target="ExtensionGlyph.Opacity" Value="1" />
                                     </VisualState.Setters>
                                 </VisualState>
-                                <VisualState x:Name="HideExtensionGlyph" />
 
                             </VisualStateGroup>
+
                             <VisualStateGroup x:Name="FlowDirectionStates">
                                 <VisualState x:Name="LeftToRight" />
                                 <VisualState x:Name="RightToLeft">
@@ -721,7 +791,6 @@
                                 <VisualState x:Name="BottomDirection" />
                                 <VisualState x:Name="TopDirection">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Bottom" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Top" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="0,2,0,0" />
@@ -730,10 +799,6 @@
                                 </VisualState>
                                 <VisualState x:Name="RightDirection">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Right" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Right" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="0,0,2,0" />
@@ -742,10 +807,6 @@
                                 </VisualState>
                                 <VisualState x:Name="LeftDirection">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Left" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Left" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="2,0,0,0" />
@@ -754,10 +815,6 @@
                                 </VisualState>
                                 <VisualState x:Name="RightDirectionRTL">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Right" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Right" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="0,0,2,0" />
@@ -766,10 +823,6 @@
                                 </VisualState>
                                 <VisualState x:Name="LeftDirectionRTL">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Left" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Left" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="2,0,0,0" />
@@ -788,20 +841,20 @@
                             <Grid.RenderTransform>
                                 <ScaleTransform x:Name="ContentTransform" />
                             </Grid.RenderTransform>
-                        <TextBlock x:Name="Content"
+                            <TextBlock x:Name="Content"
                             Style="{StaticResource InkToolbarGlyphFontStyle}"
                             Text="&#xED63;"
                             AutomationProperties.AccessibilityView="Raw"
                             Canvas.ZIndex="1"
-                            Foreground="{ThemeResource InkToolbarButtonForegroundThemeBrush}" />
-                        <TextBlock x:Name="CheckedContent"
+                            Foreground="{ThemeResource InkToolbarButtonForeground}" />
+                            <TextBlock x:Name="CheckedContent"
                             Style="{StaticResource InkToolbarGlyphFontStyle}"
                             Text="&#xED63;"
                             AutomationProperties.AccessibilityView="Raw"
                             Canvas.ZIndex="1"
                             Foreground="{ThemeResource InkToolbarButtonSelectedForegroundThemeBrush}"
                             Opacity="0" />
-                        <TextBlock x:Name="ContentFillGlyph"
+                            <TextBlock x:Name="ContentFillGlyph"
                             Text="&#xF0C6;"
                             Style="{StaticResource InkToolbarGlyphFillFontStyle}"
                             TextAlignment="Center"
@@ -809,14 +862,14 @@
                             Opacity="1"
                             Canvas.ZIndex="0"
                             Foreground="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=SelectedBrush, Mode=OneWay}" />
-                        <Border x:Name="Border"
+                            <Border x:Name="Border"
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             Grid.RowSpan="2" Grid.ColumnSpan="2"
-                            Margin="1,0"/>
+                            Margin="1,0"
+                            contract7Present:CornerRadius="{TemplateBinding CornerRadius}"/>
 
                         </Grid>
-                        <Rectangle x:Name="SelectionAccent" Style="{StaticResource InkToolbarSelectionAccentStyle}" />
 
                     </Grid>
 
@@ -840,8 +893,8 @@
                 <ControlTemplate TargetType="InkToolbarCustomPenButton">
                     <Grid x:Name="RootElement"
                         Background="{TemplateBinding Background}"
-                        Width="{ThemeResource InkToolbarButtonWidth}"
-                        Height="{ThemeResource InkToolbarButtonHeight}">
+                        Width="{StaticResource InkToolbarButtonWidth}"
+                        Height="{StaticResource InkToolbarButtonHeight}">
 
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
@@ -849,21 +902,19 @@
 
                                 <VisualState x:Name="PointerOver">
                                     <VisualState.Setters>
-                                        <Setter Target="RootElement.(RevealBrush.State)" Value="PointerOver" />
                                         <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonBackgroundPointerOver}" />
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushPointerOver}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundPointerOver}" />
-                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarButtonHoverForegroundThemeBrush}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
 
                                 <VisualState x:Name="Pressed">
                                     <VisualState.Setters>
-                                        <Setter Target="RootElement.(RevealBrush.State)" Value="Pressed" />
                                         <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonBackgroundPressed}" />
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushPressed}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundPressed}" />
-                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarButtonPressedForegroundThemeBrush}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
 
@@ -872,37 +923,64 @@
                                         <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonBackgroundDisabled}" />
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushDisabled}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundDisabled}" />
-                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarDisabledForegroundThemeBrush}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
 
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="CheckStates">
-                                <VisualState x:Name="Unchecked" />
-                                <VisualState x:Name="Indeterminate" />
-
                                 <VisualState x:Name="Checked">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.Opacity" Value="1" />
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackground}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrush}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForeground}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForeground}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
+                                        <Setter Target="Content.Opacity" Value="0" />
+                                        <Setter Target="CheckedContent.Opacity" Value="1" />
+                                        <Setter Target="ExtensionGlyph.Opacity" Value="1" />
                                     </VisualState.Setters>
                                 </VisualState>
 
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="FocusStates">
-                                <VisualState x:Name="Focused" />
-                                <VisualState x:Name="Unfocused" />
-                                <VisualState x:Name="PointerFocused" />
+                                <VisualState x:Name="CheckedPointerOver">
+                                    <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackgroundPointerOver}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrushPointerOver}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPointerOver}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPointerOver}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
+                                        <Setter Target="Content.Opacity" Value="0" />
+                                        <Setter Target="CheckedContent.Opacity" Value="1" />
+                                        <Setter Target="ExtensionGlyph.Opacity" Value="1" />
+                                    </VisualState.Setters>
+                                </VisualState>
 
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="GlyphVisualStates">
-                                <VisualState x:Name="ShowExtensionGlyph">
+                                <VisualState x:Name="CheckedPressed">
+                                    <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackgroundPressed}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrushPressed}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPressed}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPressed}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
+                                        <Setter Target="Content.Opacity" Value="0" />
+                                        <Setter Target="CheckedContent.Opacity" Value="1" />
+                                        <Setter Target="ExtensionGlyph.Opacity" Value="1" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                                <VisualState x:Name="CheckedDisabled">
                                     <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackgroundDisabled}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrushDisabled}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundDisabled}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundDisabled}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
+                                        <Setter Target="Content.Opacity" Value="0" />
+                                        <Setter Target="CheckedContent.Opacity" Value="1" />
                                         <Setter Target="ExtensionGlyph.Opacity" Value="1" />
                                     </VisualState.Setters>
                                 </VisualState>
-                                <VisualState x:Name="HideExtensionGlyph" />
 
                             </VisualStateGroup>
+
                             <VisualStateGroup x:Name="FlowDirectionStates">
                                 <VisualState x:Name="LeftToRight" />
                                 <VisualState x:Name="RightToLeft" />
@@ -912,7 +990,6 @@
                                 <VisualState x:Name="BottomDirection" />
                                 <VisualState x:Name="TopDirection">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Bottom" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Top" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="0,2,0,0" />
@@ -921,10 +998,6 @@
                                 </VisualState>
                                 <VisualState x:Name="RightDirection">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Right" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Right" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="0,0,2,0" />
@@ -933,10 +1006,6 @@
                                 </VisualState>
                                 <VisualState x:Name="LeftDirection">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Left" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Left" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="2,0,0,0" />
@@ -945,10 +1014,6 @@
                                 </VisualState>
                                 <VisualState x:Name="RightDirectionRTL">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Right" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Right" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="0,0,2,0" />
@@ -957,10 +1022,6 @@
                                 </VisualState>
                                 <VisualState x:Name="LeftDirectionRTL">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Left" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Left" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="2,0,0,0" />
@@ -983,8 +1044,8 @@
                             BorderBrush="{TemplateBinding BorderBrush}"
                             BorderThickness="{TemplateBinding BorderThickness}"
                             Grid.RowSpan="2" Grid.ColumnSpan="2"
-                            Margin="1,0"/>
-                        <Rectangle x:Name="SelectionAccent" Style="{StaticResource InkToolbarSelectionAccentStyle}" />
+                            Margin="1,0"
+                            contract7Present:CornerRadius="{TemplateBinding CornerRadius}"/>
 
                     </Grid>
 
@@ -1003,8 +1064,9 @@
         <Setter Property="HorizontalAlignment" Value="Stretch" />
         <Setter Property="VerticalAlignment" Value="Center" />
         <Setter Property="MinWidth" Value="136" />
-        <Setter Property="Height" Value="48" />
+        <Setter Property="Height" Value="40" />
         <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
+        <contract7Present:Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
         <Setter Property="Template">
             <Setter.Value>
                 <ControlTemplate TargetType="InkToolbarFlyoutItem">
@@ -1016,6 +1078,7 @@
                                     <VisualState.Setters>
                                         <Setter Target="Border.Background" Value="{ThemeResource InkToolbarFlyoutItemBackgroundThemeBrush}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarFlyoutItemForegroundThemeBrush}" />
+                                        <Setter Target="CurrentSelectionIcon.Opacity" Value="0" />
                                     </VisualState.Setters>
                                 </VisualState>
 
@@ -1023,6 +1086,7 @@
                                     <VisualState.Setters>
                                         <Setter Target="Border.Background" Value="{ThemeResource InkToolbarFlyoutItemHoverBackgroundThemeBrush}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarFlyoutItemHoverForegroundThemeBrush}" />
+                                        <Setter Target="CurrentSelectionIcon.Opacity" Value="0" />
                                     </VisualState.Setters>
                                 </VisualState>
 
@@ -1030,6 +1094,7 @@
                                     <VisualState.Setters>
                                         <Setter Target="Border.Background" Value="{ThemeResource InkToolbarFlyoutItemPressedBackgroundThemeBrush}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarFlyoutItemPressedForegroundThemeBrush}" />
+                                        <Setter Target="CurrentSelectionIcon.Opacity" Value="1" />
                                     </VisualState.Setters>
                                 </VisualState>
 
@@ -1037,56 +1102,57 @@
                                     <VisualState.Setters>
                                         <Setter Target="Border.Background" Value="{ThemeResource ButtonBackgroundDisabled}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource ButtonForegroundDisabled}" />
+                                        <Setter Target="CurrentSelectionIcon.Opacity" Value="0" />
                                     </VisualState.Setters>
                                 </VisualState>
 
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="CheckStates">
-                                <VisualState x:Name="Unchecked" />
-                                <VisualState x:Name="Indeterminate" />
-
                                 <VisualState x:Name="Checked">
                                     <VisualState.Setters>
                                         <Setter Target="Border.Background" Value="{ThemeResource InkToolbarFlyoutItemSelectedBackgroundThemeBrush}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarFlyoutItemSelectedForegroundThemeBrush}" />
+                                        <Setter Target="CurrentSelectionIcon.Opacity" Value="1" />
                                     </VisualState.Setters>
                                 </VisualState>
                                 <VisualState x:Name="CheckedPointerOver">
                                     <VisualState.Setters>
                                         <Setter Target="Border.Background" Value="{ThemeResource InkToolbarFlyoutItemHoverSelectedBackgroundThemeBrush}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarFlyoutItemHoverForegroundThemeBrush}" />
+                                        <Setter Target="CurrentSelectionIcon.Opacity" Value="1" />
+                                        <Setter Target="CurrentSelectionIcon.Fill" Value="{ThemeResource InkToolbarAccentHoverColorForegroundThemeBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
                                 <VisualState x:Name="CheckedPressed">
                                     <VisualState.Setters>
                                         <Setter Target="Border.Background" Value="{ThemeResource InkToolbarFlyoutItemPressedSelectedBackgroundThemeBrush}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarFlyoutItemPressedForegroundThemeBrush}" />
+                                        <Setter Target="CurrentSelectionIcon.Opacity" Value="1" />
                                     </VisualState.Setters>
                                 </VisualState>
                                 <VisualState x:Name="CheckedDisabled">
                                     <VisualState.Setters>
                                         <Setter Target="Border.Background" Value="{ThemeResource ButtonBackgroundDisabled}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource ButtonForegroundDisabled}" />
+                                        <Setter Target="CurrentSelectionIcon.Opacity" Value="1" />
                                     </VisualState.Setters>
                                 </VisualState>
 
                             </VisualStateGroup>
-                            <VisualStateGroup x:Name="FocusStates">
-                                <VisualState x:Name="Focused" />
-                                <VisualState x:Name="Unfocused" />
-                                <VisualState x:Name="PointerFocused" />
-
-                            </VisualStateGroup>
 
                         </VisualStateManager.VisualStateGroups>
                         <Border x:Name="Border"
                             BorderBrush="Transparent"
                             BorderThickness="0"
-                            Background="Transparent">
-                            <ContentPresenter x:Name="Content"
-                                Foreground="{TemplateBinding Foreground}"
-                                HorizontalAlignment="Left"
-                                VerticalAlignment="Center"/>
+                            Background="Transparent"
+                            contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
+                            Control.IsTemplateFocusTarget="True"
+                            Margin ="2,2,2,2">
+                            <Grid>
+                                <Rectangle x:Name="CurrentSelectionIcon" Style="{StaticResource InkToolbarFlyoutItemSelectionAccentStyle}" />
+                                <ContentPresenter x:Name="Content"
+                                    Foreground="{TemplateBinding Foreground}"
+                                    HorizontalAlignment="Left"
+                                    VerticalAlignment="Center"/>
+                            </Grid>
                         </Border>
 
                     </Grid>
@@ -1095,8 +1161,10 @@
             </Setter.Value>
         </Setter>
     </Style>
+
+    <!-- Some items are controlled by XAML private API, but still want to keep them here to give developers a refenrence-->
     <DataTemplate x:Key="InkToolbarEraserButtonFlyoutContentTemplate">
-        <StackPanel x:Name="InkToolbarEraserButtonFlyoutContent" Margin="0,8,0,8">
+        <StackPanel x:Name="InkToolbarEraserButtonFlyoutContent" Margin="{StaticResource InkToolbarFlyoutPanelMargin}">
             <InkToolbarFlyoutItem x:Name="StrokeEraser" Kind="RadioCheck" AutomationProperties.AutomationId="InkToolbarStrokeEraser"
                             Style="{StaticResource InkToolbarFlyoutItemStyle}">
                 <InkToolbarFlyoutItem.Content>
@@ -1112,13 +1180,13 @@
                             Grid.Column="0"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            Margin="12,0,12,0"/>
+                            Margin="{StaticResource InkToolbarFlyoutItemIconMargin}"/>
                         <TextBlock x:Name="StrokeEraserName"
                             Style="{StaticResource InkToolbarFlyoutItemContentTextStyle}"
                             Text=""
                             TextAlignment="Center"
                             Grid.Column="1"
-                            Margin="0,0,12,0"/>
+                            Margin="{StaticResource InkToolbarFlyoutItemTextBlockMargin}"/>
 
                     </Grid>
                 </InkToolbarFlyoutItem.Content>
@@ -1140,13 +1208,13 @@
                             Grid.Column="0"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            Margin="12,0,12,0"/>
+                            Margin="{StaticResource InkToolbarFlyoutItemIconMargin}"/>
                         <TextBlock x:Name="SmallEraserName"
                             Style="{StaticResource InkToolbarFlyoutItemContentTextStyle}"
                             Text=""
                             TextAlignment="Center"
                             Grid.Column="1"
-                            Margin="0,0,12,0"/>
+                            Margin="{StaticResource InkToolbarFlyoutItemTextBlockMargin}"/>
 
                     </Grid>
                 </InkToolbarFlyoutItem.Content>
@@ -1168,13 +1236,13 @@
                             Grid.Column="0"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            Margin="12,0,12,0"/>
+                            Margin="{StaticResource InkToolbarFlyoutItemIconMargin}"/>
                         <TextBlock x:Name="LargeEraserName"
                             Style="{StaticResource InkToolbarFlyoutItemContentTextStyle}"
                             Text=""
                             TextAlignment="Center"
                             Grid.Column="1"
-                            Margin="0,0,12,0"/>
+                            Margin="{StaticResource InkToolbarFlyoutItemTextBlockMargin}"/>
 
                     </Grid>
                 </InkToolbarFlyoutItem.Content>
@@ -1196,13 +1264,13 @@
                             Grid.Column="0"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            Margin="12,0,12,0"/>
+                            Margin="{StaticResource InkToolbarFlyoutItemIconMargin}"/>
                         <TextBlock x:Name="ClearAllName"
                             Style="{StaticResource InkToolbarFlyoutItemContentTextStyle}"
                             Text=""
                             TextAlignment="Center"
                             Grid.Column="1"
-                            Margin="0,0,12,0"/>
+                            Margin="{StaticResource InkToolbarFlyoutItemTextBlockMargin}"/>
 
                     </Grid>
                 </InkToolbarFlyoutItem.Content>
@@ -1217,8 +1285,9 @@
                 <ControlTemplate TargetType="InkToolbarEraserButton">
                     <Grid x:Name="RootElement"
                         Background="{TemplateBinding Background}"
-                        Width="{ThemeResource InkToolbarButtonWidth}"
-                        Height="{ThemeResource InkToolbarButtonHeight}">
+                        Width="{StaticResource InkToolbarButtonWidth}"
+                        Height="{StaticResource InkToolbarButtonHeight}"
+                        contract7Present:CornerRadius="{TemplateBinding CornerRadius}">
 
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
@@ -1226,23 +1295,21 @@
 
                                 <VisualState x:Name="PointerOver">
                                     <VisualState.Setters>
-                                        <Setter Target="RootElement.(RevealBrush.State)" Value="PointerOver" />
                                         <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonBackgroundPointerOver}" />
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushPointerOver}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundPointerOver}" />
                                         <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonHoverForegroundThemeBrush}" />
-                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarButtonHoverForegroundThemeBrush}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
 
                                 <VisualState x:Name="Pressed">
                                     <VisualState.Setters>
-                                        <Setter Target="RootElement.(RevealBrush.State)" Value="Pressed" />
                                         <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonBackgroundPressed}" />
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushPressed}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundPressed}" />
                                         <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonPressedForegroundThemeBrush}" />
-                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarButtonPressedForegroundThemeBrush}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
 
@@ -1252,39 +1319,64 @@
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushDisabled}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundDisabled}" />
                                         <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarDisabledForegroundThemeBrush}" />
-                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarDisabledForegroundThemeBrush}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
 
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="CheckStates">
-                                <VisualState x:Name="Unchecked" />
-                                <VisualState x:Name="Indeterminate" />
-
                                 <VisualState x:Name="Checked">
                                     <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackground}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrush}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForeground}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForeground}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                         <Setter Target="Content.Opacity" Value="0" />
                                         <Setter Target="CheckedContent.Opacity" Value="1" />
-                                        <Setter Target="SelectionAccent.Opacity" Value="1" />
+                                        <Setter Target="ExtensionGlyph.Opacity" Value="1" />
                                     </VisualState.Setters>
                                 </VisualState>
 
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="FocusStates">
-                                <VisualState x:Name="Focused" />
-                                <VisualState x:Name="Unfocused" />
-                                <VisualState x:Name="PointerFocused" />
+                                <VisualState x:Name="CheckedPointerOver">
+                                    <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackgroundPointerOver}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrushPointerOver}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPointerOver}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPointerOver}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
+                                        <Setter Target="Content.Opacity" Value="0" />
+                                        <Setter Target="CheckedContent.Opacity" Value="1" />
+                                        <Setter Target="ExtensionGlyph.Opacity" Value="1" />
+                                    </VisualState.Setters>
+                                </VisualState>
 
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="GlyphVisualStates">
-                                <VisualState x:Name="ShowExtensionGlyph">
+                                <VisualState x:Name="CheckedPressed">
+                                    <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackgroundPressed}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrushPressed}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPressed}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPressed}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
+                                        <Setter Target="Content.Opacity" Value="0" />
+                                        <Setter Target="CheckedContent.Opacity" Value="1" />
+                                        <Setter Target="ExtensionGlyph.Opacity" Value="1" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                                <VisualState x:Name="CheckedDisabled">
                                     <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackgroundDisabled}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrushDisabled}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundDisabled}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundDisabled}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
+                                        <Setter Target="Content.Opacity" Value="0" />
+                                        <Setter Target="CheckedContent.Opacity" Value="1" />
                                         <Setter Target="ExtensionGlyph.Opacity" Value="1" />
                                     </VisualState.Setters>
                                 </VisualState>
-                                <VisualState x:Name="HideExtensionGlyph" />
 
                             </VisualStateGroup>
+
                             <VisualStateGroup x:Name="FlowDirectionStates">
                                 <VisualState x:Name="LeftToRight" />
                                 <VisualState x:Name="RightToLeft">
@@ -1298,7 +1390,6 @@
                                 <VisualState x:Name="BottomDirection" />
                                 <VisualState x:Name="TopDirection">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Bottom" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Top" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="0,2,0,0" />
@@ -1307,10 +1398,6 @@
                                 </VisualState>
                                 <VisualState x:Name="RightDirection">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Right" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Right" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="0,0,2,0" />
@@ -1319,10 +1406,6 @@
                                 </VisualState>
                                 <VisualState x:Name="LeftDirection">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Left" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Left" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="2,0,0,0" />
@@ -1331,10 +1414,6 @@
                                 </VisualState>
                                 <VisualState x:Name="RightDirectionRTL">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Right" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Right" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="0,0,2,0" />
@@ -1343,10 +1422,6 @@
                                 </VisualState>
                                 <VisualState x:Name="LeftDirectionRTL">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Left" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Left" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="2,0,0,0" />
@@ -1370,7 +1445,7 @@
                                 Text="&#xED60;"
                                 AutomationProperties.AccessibilityView="Raw"
                                 Canvas.ZIndex="1"
-                                Foreground="{ThemeResource InkToolbarButtonForegroundThemeBrush}" />
+                                Foreground="{ThemeResource InkToolbarButtonForeground}" />
                             <TextBlock x:Name="CheckedContent"
                                 Style="{StaticResource InkToolbarGlyphFontStyle}"
                                 Text="&#xED60;"
@@ -1383,10 +1458,10 @@
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 Grid.RowSpan="2"
                                 Grid.ColumnSpan="2"
-                                Margin="1,0"/>
+                                Margin="1,0"
+                                contract7Present:CornerRadius="{TemplateBinding CornerRadius}"/>
 
                         </Grid>
-                        <Rectangle x:Name="SelectionAccent" Style="{StaticResource InkToolbarSelectionAccentStyle}" />
 
                     </Grid>
 
@@ -1406,8 +1481,8 @@
                 <ControlTemplate TargetType="InkToolbarCustomToolButton">
                     <Grid x:Name="RootElement"
                         Background="{TemplateBinding Background}"
-                        Width="{ThemeResource InkToolbarButtonWidth}"
-                        Height="{ThemeResource InkToolbarButtonHeight}">
+                        Width="{StaticResource InkToolbarButtonWidth}"
+                        Height="{StaticResource InkToolbarButtonHeight}">
 
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
@@ -1415,21 +1490,19 @@
 
                                 <VisualState x:Name="PointerOver">
                                     <VisualState.Setters>
-                                        <Setter Target="RootElement.(RevealBrush.State)" Value="PointerOver" />
                                         <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonBackgroundPointerOver}" />
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushPointerOver}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundPointerOver}" />
-                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarButtonHoverForegroundThemeBrush}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
 
                                 <VisualState x:Name="Pressed">
                                     <VisualState.Setters>
-                                        <Setter Target="RootElement.(RevealBrush.State)" Value="Pressed" />
                                         <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonBackgroundPressed}" />
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushPressed}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundPressed}" />
-                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarButtonPressedForegroundThemeBrush}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
 
@@ -1438,37 +1511,12 @@
                                         <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonBackgroundDisabled}" />
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushDisabled}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundDisabled}" />
-                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarDisabledForegroundThemeBrush}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
 
                             </VisualStateGroup>
-                            <VisualStateGroup x:Name="CheckStates">
-                                <VisualState x:Name="Unchecked" />
-                                <VisualState x:Name="Indeterminate" />
 
-                                <VisualState x:Name="Checked">
-                                    <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.Opacity" Value="1" />
-                                    </VisualState.Setters>
-                                </VisualState>
-
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="FocusStates">
-                                <VisualState x:Name="Focused" />
-                                <VisualState x:Name="Unfocused" />
-                                <VisualState x:Name="PointerFocused" />
-
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="GlyphVisualStates">
-                                <VisualState x:Name="ShowExtensionGlyph">
-                                    <VisualState.Setters>
-                                        <Setter Target="ExtensionGlyph.Opacity" Value="1" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="HideExtensionGlyph" />
-
-                            </VisualStateGroup>
                             <VisualStateGroup x:Name="FlowDirectionStates">
                                 <VisualState x:Name="LeftToRight" />
                                 <VisualState x:Name="RightToLeft" />
@@ -1478,7 +1526,6 @@
                                 <VisualState x:Name="BottomDirection" />
                                 <VisualState x:Name="TopDirection">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Bottom" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Top" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="0,2,0,0" />
@@ -1487,10 +1534,6 @@
                                 </VisualState>
                                 <VisualState x:Name="RightDirection">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Right" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Right" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="0,0,2,0" />
@@ -1499,10 +1542,6 @@
                                 </VisualState>
                                 <VisualState x:Name="LeftDirection">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Left" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Left" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="2,0,0,0" />
@@ -1511,10 +1550,6 @@
                                 </VisualState>
                                 <VisualState x:Name="RightDirectionRTL">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Right" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Right" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="0,0,2,0" />
@@ -1523,10 +1558,6 @@
                                 </VisualState>
                                 <VisualState x:Name="LeftDirectionRTL">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Left" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Left" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="2,0,0,0" />
@@ -1550,8 +1581,8 @@
                             BorderThickness="{TemplateBinding BorderThickness}"
                             Grid.RowSpan="2"
                             Grid.ColumnSpan="2"
-                            Margin="1,0"/>
-                        <Rectangle x:Name="SelectionAccent" Style="{StaticResource InkToolbarSelectionAccentStyle}" />
+                            Margin="1,0"
+                            contract7Present:CornerRadius="{TemplateBinding CornerRadius}"/>
 
                     </Grid>
 
@@ -1559,7 +1590,7 @@
             </Setter.Value>
         </Setter>
     </Style>
-    
+
     <Style TargetType="InkToolbarRulerButton" BasedOn="{StaticResource InkToolbarCommonButtonStyle}">
         <Setter Property="AutomationProperties.AutomationId" Value="InkToolbarRulerButton" />
         <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
@@ -1568,8 +1599,8 @@
                 <ControlTemplate TargetType="InkToolbarRulerButton">
                     <Grid x:Name="RootElement"
                         Background="{TemplateBinding Background}"
-                        Width="{ThemeResource InkToolbarButtonWidth}"
-                        Height="{ThemeResource InkToolbarButtonHeight}">
+                        Width="{StaticResource InkToolbarButtonWidth}"
+                        Height="{StaticResource InkToolbarButtonHeight}">
 
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
@@ -1577,7 +1608,6 @@
 
                                 <VisualState x:Name="PointerOver">
                                     <VisualState.Setters>
-                                        <Setter Target="RootElement.(RevealBrush.State)" Value="PointerOver" />
                                         <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonBackgroundPointerOver}" />
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushPointerOver}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundPointerOver}" />
@@ -1587,7 +1617,6 @@
 
                                 <VisualState x:Name="Pressed">
                                     <VisualState.Setters>
-                                        <Setter Target="RootElement.(RevealBrush.State)" Value="Pressed" />
                                         <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonBackgroundPressed}" />
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushPressed}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundPressed}" />
@@ -1604,26 +1633,59 @@
                                     </VisualState.Setters>
                                 </VisualState>
 
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="CheckStates">
-                                <VisualState x:Name="Unchecked" />
-                                <VisualState x:Name="Indeterminate" />
-
                                 <VisualState x:Name="Checked">
                                     <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackground}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrush}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForeground}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForeground}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                         <Setter Target="Content.Opacity" Value="0" />
                                         <Setter Target="CheckedContent.Opacity" Value="1" />
-                                        <Setter Target="SelectionAccent.Opacity" Value="1" />
+                                        <Setter Target="ExtensionGlyph.Opacity" Value="1" />
                                     </VisualState.Setters>
                                 </VisualState>
 
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="FocusStates">
-                                <VisualState x:Name="Focused" />
-                                <VisualState x:Name="Unfocused" />
-                                <VisualState x:Name="PointerFocused" />
+                                <VisualState x:Name="CheckedPointerOver">
+                                    <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackgroundPointerOver}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrushPointerOver}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPointerOver}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPointerOver}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
+                                        <Setter Target="Content.Opacity" Value="0" />
+                                        <Setter Target="CheckedContent.Opacity" Value="1" />
+                                        <Setter Target="ExtensionGlyph.Opacity" Value="1" />
+                                    </VisualState.Setters>
+                                </VisualState>
 
+                                <VisualState x:Name="CheckedPressed">
+                                    <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackgroundPressed}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrushPressed}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPressed}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPressed}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
+                                        <Setter Target="Content.Opacity" Value="0" />
+                                        <Setter Target="CheckedContent.Opacity" Value="1" />
+                                        <Setter Target="ExtensionGlyph.Opacity" Value="1" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                                <VisualState x:Name="CheckedDisabled">
+                                    <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackgroundDisabled}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrushDisabled}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundDisabled}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundDisabled}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
+                                        <Setter Target="Content.Opacity" Value="0" />
+                                        <Setter Target="CheckedContent.Opacity" Value="1" />
+                                        <Setter Target="ExtensionGlyph.Opacity" Value="1" />
+                                    </VisualState.Setters>
+                                </VisualState>
                             </VisualStateGroup>
+
                             <VisualStateGroup x:Name="FlowDirectionStates">
                                 <VisualState x:Name="LeftToRight" />
                                 <VisualState x:Name="RightToLeft">
@@ -1648,7 +1710,7 @@
                                 Text="&#xECC6;"
                                 AutomationProperties.AccessibilityView="Raw"
                                 Canvas.ZIndex="1"
-                                Foreground="{ThemeResource InkToolbarButtonForegroundThemeBrush}" />
+                                Foreground="{ThemeResource InkToolbarButtonForeground}" />
                             <TextBlock x:Name="CheckedContent"
                                 Style="{StaticResource InkToolbarGlyphFontStyle}"
                                 Text="&#xECC6;"
@@ -1661,10 +1723,10 @@
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 Grid.RowSpan="2"
                                 Grid.ColumnSpan="2"
-                                Margin="1,0"/>
+                                Margin="1,0"
+                                contract7Present:CornerRadius="{TemplateBinding CornerRadius}"/>
 
                         </Grid>
-                        <Rectangle x:Name="SelectionAccent" Style="{StaticResource InkToolbarSelectionAccentStyle}" />
 
                     </Grid>
 
@@ -1672,7 +1734,7 @@
             </Setter.Value>
         </Setter>
     </Style>
-    
+
     <Style TargetType="InkToolbarCustomToggleButton" BasedOn="{StaticResource InkToolbarCommonButtonStyle}">
         <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
         <Setter Property="Template">
@@ -1680,8 +1742,9 @@
                 <ControlTemplate TargetType="InkToolbarCustomToggleButton">
                     <Grid x:Name="RootElement"
                         Background="{TemplateBinding Background}"
-                        Width="{ThemeResource InkToolbarButtonWidth}"
-                        Height="{ThemeResource InkToolbarButtonHeight}">
+                        Width="{StaticResource InkToolbarButtonWidth}"
+                        Height="{StaticResource InkToolbarButtonHeight}"
+                        contract7Present:CornerRadius="{TemplateBinding CornerRadius}">
 
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
@@ -1689,7 +1752,6 @@
 
                                 <VisualState x:Name="PointerOver">
                                     <VisualState.Setters>
-                                        <Setter Target="RootElement.(RevealBrush.State)" Value="PointerOver" />
                                         <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonBackgroundPointerOver}" />
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushPointerOver}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundPointerOver}" />
@@ -1698,7 +1760,6 @@
 
                                 <VisualState x:Name="Pressed">
                                     <VisualState.Setters>
-                                        <Setter Target="RootElement.(RevealBrush.State)" Value="Pressed" />
                                         <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonBackgroundPressed}" />
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushPressed}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundPressed}" />
@@ -1714,53 +1775,12 @@
                                 </VisualState>
 
                             </VisualStateGroup>
-                            <VisualStateGroup x:Name="CheckStates">
-                                <VisualState x:Name="Unchecked" />
-                                <VisualState x:Name="Indeterminate" />
-
-                                <VisualState x:Name="Checked">
-                                    <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.Opacity" Value="1" />
-                                    </VisualState.Setters>
-                                </VisualState>
-
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="FocusStates">
-                                <VisualState x:Name="Focused" />
-                                <VisualState x:Name="Unfocused" />
-                                <VisualState x:Name="PointerFocused" />
 
-                            </VisualStateGroup>
                             <VisualStateGroup x:Name="FlowDirectionStates">
                                 <VisualState x:Name="LeftToRight" />
                                 <VisualState x:Name="RightToLeft" />
 
                             </VisualStateGroup>
-                            <VisualStateGroup x:Name="ButtonFlyoutDirectionStates">
-                                <VisualState x:Name="BottomDirection" />
-                                <VisualState x:Name="TopDirection">
-                                    <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Bottom" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="RightDirection">
-                                    <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Right" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
-                                    </VisualState.Setters>
-                                </VisualState>
-                                <VisualState x:Name="LeftDirection">
-                                    <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Left" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
-                                    </VisualState.Setters>
-                                </VisualState>
-
-                            </VisualStateGroup>
 
                         </VisualStateManager.VisualStateGroups>
                         <Rectangle x:Name="ContentBackground" Fill="Transparent" />
@@ -1773,8 +1793,8 @@
                             BorderThickness="{TemplateBinding BorderThickness}"
                             Grid.RowSpan="2"
                             Grid.ColumnSpan="2"
-                            Margin="1,0"/>
-                        <Rectangle x:Name="SelectionAccent" Style="{StaticResource InkToolbarSelectionAccentStyle}" />
+                            Margin="1,0"
+                            contract7Present:CornerRadius="{TemplateBinding CornerRadius}"/>
 
                     </Grid>
 
@@ -1782,9 +1802,9 @@
             </Setter.Value>
         </Setter>
     </Style>
-    
+
     <DataTemplate x:Key="InkToolbarStencilButtonFlyoutContentTemplate">
-        <StackPanel x:Name="InkToolbarStencilButtonFlyoutContent" Margin="0,8,0,8">
+        <StackPanel x:Name="InkToolbarStencilButtonFlyoutContent" Margin="{StaticResource InkToolbarFlyoutPanelMargin}">
             <InkToolbarFlyoutItem x:Name="StencilRuler" Kind="RadioCheck"
                 AutomationProperties.AutomationId="InkToolbarStencilRuler"
                 Style="{StaticResource InkToolbarFlyoutItemStyle}">
@@ -1801,13 +1821,13 @@
                             Grid.Column="0"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            Margin="12,0,12,0"/>
+                            Margin="{StaticResource InkToolbarFlyoutItemIconMargin}"/>
                         <TextBlock x:Name="RulerName"
                             Style="{StaticResource InkToolbarFlyoutItemContentTextStyle}"
                             Text=""
                             TextAlignment="Center"
                             Grid.Column="1"
-                            Margin="0,0,12,0"/>
+                            Margin="{StaticResource InkToolbarFlyoutItemTextBlockMargin}"/>
 
                     </Grid>
                 </InkToolbarFlyoutItem.Content>
@@ -1828,13 +1848,13 @@
                             Grid.Column="0"
                             HorizontalAlignment="Center"
                             VerticalAlignment="Center"
-                            Margin="12,0,12,0"/>
+                            Margin="{StaticResource InkToolbarFlyoutItemIconMargin}"/>
                         <TextBlock x:Name="ProtractorName"
                             Style="{StaticResource InkToolbarFlyoutItemContentTextStyle}"
                             Text=""
                             TextAlignment="Center"
                             Grid.Column="1"
-                            Margin="0,0,12,0"/>
+                            Margin="{StaticResource InkToolbarFlyoutItemTextBlockMargin}"/>
 
                     </Grid>
                 </InkToolbarFlyoutItem.Content>
@@ -1850,8 +1870,9 @@
                 <ControlTemplate TargetType="InkToolbarStencilButton">
                     <Grid x:Name="RootElement"
                         Background="{TemplateBinding Background}"
-                        Width="{ThemeResource InkToolbarButtonWidth}"
-                        Height="{ThemeResource InkToolbarButtonHeight}">
+                        Width="{StaticResource InkToolbarButtonWidth}"
+                        Height="{StaticResource InkToolbarButtonHeight}"
+                        contract7Present:CornerRadius="{TemplateBinding CornerRadius}">
 
                         <VisualStateManager.VisualStateGroups>
                             <VisualStateGroup x:Name="CommonStates">
@@ -1859,23 +1880,21 @@
 
                                 <VisualState x:Name="PointerOver">
                                     <VisualState.Setters>
-                                        <Setter Target="RootElement.(RevealBrush.State)" Value="PointerOver" />
                                         <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonBackgroundPointerOver}" />
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushPointerOver}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundPointerOver}" />
                                         <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonHoverForegroundThemeBrush}" />
-                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarButtonHoverForegroundThemeBrush}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
 
                                 <VisualState x:Name="Pressed">
                                     <VisualState.Setters>
-                                        <Setter Target="RootElement.(RevealBrush.State)" Value="Pressed" />
                                         <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonBackgroundPressed}" />
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushPressed}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundPressed}" />
                                         <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonPressedForegroundThemeBrush}" />
-                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarButtonPressedForegroundThemeBrush}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
 
@@ -1885,61 +1904,72 @@
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushDisabled}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundDisabled}" />
                                         <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarDisabledForegroundThemeBrush}" />
-                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarDisabledForegroundThemeBrush}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                     </VisualState.Setters>
                                 </VisualState>
 
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="CheckStates">
-                                <VisualState x:Name="Unchecked" />
-                                <VisualState x:Name="Indeterminate" />
-
                                 <VisualState x:Name="Checked">
                                     <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackground}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrush}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForeground}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForeground}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                         <Setter Target="Content.Opacity" Value="0" />
                                         <Setter Target="CheckedContent.Opacity" Value="1" />
-                                        <Setter Target="SelectionAccent.Opacity" Value="1" />
+                                        <Setter Target="ExtensionGlyph.Opacity" Value="1" />
                                     </VisualState.Setters>
                                 </VisualState>
+
+                                <VisualState x:Name="CheckedPressed">
+                                    <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackgroundPressed}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrushPressed}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPressed}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundPressed}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
+                                        <Setter Target="Content.Opacity" Value="0" />
+                                        <Setter Target="CheckedContent.Opacity" Value="1" />
+                                        <Setter Target="ExtensionGlyph.Opacity" Value="1" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
+                                <VisualState x:Name="CheckedDisabled">
+                                    <VisualState.Setters>
+                                        <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonSelectedBackgroundDisabled}" />
+                                        <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonSelectedBorderBrushDisabled}" />
+                                        <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundDisabled}" />
+                                        <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonSelectedForegroundDisabled}" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
+                                        <Setter Target="Content.Opacity" Value="0" />
+                                        <Setter Target="CheckedContent.Opacity" Value="1" />
+                                        <Setter Target="ExtensionGlyph.Opacity" Value="1" />
+                                    </VisualState.Setters>
+                                </VisualState>
+
                                 <VisualState x:Name="CheckedPointerOver">
                                     <VisualState.Setters>
-                                        <Setter Target="RootElement.(RevealBrush.State)" Value="PointerOver" />
                                         <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonBackgroundPointerOver}" />
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushPointerOver}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundPointerOver}" />
                                         <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonHoverForegroundThemeBrush}" />
-                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarButtonHoverForegroundThemeBrush}" />
-                                        <Setter Target="SelectionAccent.Opacity" Value="1" />
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
+                                        <Setter Target="ExtensionGlyph.Opacity" Value="1" />
                                     </VisualState.Setters>
                                 </VisualState>
                                 <VisualState x:Name="IndeterminatePointerOver">
                                     <VisualState.Setters>
-                                        <Setter Target="RootElement.(RevealBrush.State)" Value="PointerOver" />
                                         <Setter Target="RootElement.Background" Value="{ThemeResource InkToolbarButtonBackgroundPointerOver}" />
                                         <Setter Target="Border.BorderBrush" Value="{ThemeResource InkToolbarButtonBorderBrushPointerOver}" />
                                         <Setter Target="Content.Foreground" Value="{ThemeResource InkToolbarButtonForegroundPointerOver}" />
                                         <Setter Target="CheckedContent.Foreground" Value="{ThemeResource InkToolbarButtonHoverForegroundThemeBrush}" />
-                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarButtonHoverForegroundThemeBrush}" />
-                                        <Setter Target="SelectionAccent.Opacity" Value="1" />
-                                    </VisualState.Setters>
-                                </VisualState>
-
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="FocusStates">
-                                <VisualState x:Name="Focused" />
-                                <VisualState x:Name="Unfocused" />
-                                <VisualState x:Name="PointerFocused" />
-
-                            </VisualStateGroup>
-                            <VisualStateGroup x:Name="GlyphVisualStates">
-                                <VisualState x:Name="ShowExtensionGlyph">
-                                    <VisualState.Setters>
+                                        <Setter Target="ExtensionGlyph.Foreground" Value="{ThemeResource InkToolbarAccentColorForegroundThemeBrush}" />
                                         <Setter Target="ExtensionGlyph.Opacity" Value="1" />
                                     </VisualState.Setters>
                                 </VisualState>
-                                <VisualState x:Name="HideExtensionGlyph" />
 
                             </VisualStateGroup>
+
                             <VisualStateGroup x:Name="FlowDirectionStates">
                                 <VisualState x:Name="LeftToRight" />
                                 <VisualState x:Name="RightToLeft">
@@ -1953,7 +1983,6 @@
                                 <VisualState x:Name="BottomDirection" />
                                 <VisualState x:Name="TopDirection">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Bottom" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Top" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="0,2,0,0" />
@@ -1962,10 +1991,6 @@
                                 </VisualState>
                                 <VisualState x:Name="RightDirection">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Right" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Right" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="0,0,2,0" />
@@ -1974,10 +1999,6 @@
                                 </VisualState>
                                 <VisualState x:Name="LeftDirection">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Left" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Left" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="2,0,0,0" />
@@ -1986,10 +2007,6 @@
                                 </VisualState>
                                 <VisualState x:Name="RightDirectionRTL">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Right" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Right" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="0,0,2,0" />
@@ -1998,10 +2015,6 @@
                                 </VisualState>
                                 <VisualState x:Name="LeftDirectionRTL">
                                     <VisualState.Setters>
-                                        <Setter Target="SelectionAccent.HorizontalAlignment" Value="Left" />
-                                        <Setter Target="SelectionAccent.VerticalAlignment" Value="Stretch" />
-                                        <Setter Target="SelectionAccent.Height" Value="auto" />
-                                        <Setter Target="SelectionAccent.Width" Value="2" />
                                         <Setter Target="ExtensionGlyph.HorizontalAlignment" Value="Left" />
                                         <Setter Target="ExtensionGlyph.VerticalAlignment" Value="Center" />
                                         <Setter Target="ExtensionGlyph.Margin" Value="2,0,0,0" />
@@ -2025,7 +2038,7 @@
                                 Text=""
                                 AutomationProperties.AccessibilityView="Raw"
                                 Canvas.ZIndex="1"
-                                Foreground="{ThemeResource InkToolbarButtonForegroundThemeBrush}" />
+                                Foreground="{ThemeResource InkToolbarButtonForeground}" />
                             <TextBlock x:Name="CheckedContent"
                                 Style="{StaticResource InkToolbarGlyphFontStyle}"
                                 Text=""
@@ -2038,10 +2051,10 @@
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 Grid.RowSpan="2"
                                 Grid.ColumnSpan="2"
-                                Margin="1,0"/>
+                                Margin="1,0"
+                                contract7Present:CornerRadius="{TemplateBinding CornerRadius}"/>
 
                         </Grid>
-                        <Rectangle x:Name="SelectionAccent" Style="{StaticResource InkToolbarSelectionAccentStyle}" />
 
                     </Grid>
 
@@ -2058,8 +2071,8 @@
                         Orientation="Horizontal"
                         Background="{TemplateBinding Background}"
                         BorderBrush="{TemplateBinding BorderBrush}"
-                        BorderThickness="{TemplateBinding BorderThickness}" />
-
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        Margin="2,2,2,2"/>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
@@ -2100,7 +2113,7 @@
                             Grid.Row="1"
                             Grid.Column="0"
                             Padding="12,0,12,0"
-                            Style="{ThemeResource BodyTextBlockStyle}"
+                            Style="{ThemeResource InkToolbarPenConfigurationControlTextStyle}"
                             HighContrastAdjustment="None"
                             Text="Colors" />
                         <!-- Color palette -->
@@ -2204,7 +2217,7 @@
                             Grid.Column="0"
                             Padding="12,0,12,0"
                             VerticalAlignment="Center"
-                            Style="{ThemeResource BodyTextBlockStyle}"
+                            Style="{ThemeResource InkToolbarPenConfigurationControlTextStyle}"
                             Text="Size"
                             HighContrastAdjustment="None" />
                         <Grid x:Name="StrokePreviewGrid"
@@ -2225,8 +2238,7 @@
                             HorizontalAlignment="Stretch"
                             Minimum="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=PenButton.MinStrokeWidth}"
                             Maximum="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=PenButton.MaxStrokeWidth}"
-                            Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=PenButton.SelectedStrokeWidth, Mode=TwoWay}"
-                            Style="{StaticResource FlyoutStrokeWidthSelectorStyle}" />
+                            Value="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=PenButton.SelectedStrokeWidth, Mode=TwoWay}"/>
 
                     </Grid>
 
diff --git a/dev/CommonStyles/InteractionTests/CommonStylesTests.cs b/dev/CommonStyles/InteractionTests/CommonStylesTests.cs
index 0d89867432..f1abe51e64 100644
--- a/dev/CommonStyles/InteractionTests/CommonStylesTests.cs
+++ b/dev/CommonStyles/InteractionTests/CommonStylesTests.cs
@@ -158,6 +158,14 @@ public void InkToolbarTest()
             {
                 var textBlock = FindElement.ByName("InkToolbar");
                 Verify.IsNotNull(textBlock, "Verify InkToolbar page doesn't crash");
+
+                var verticalInkToolbar = FindElement.ById("VerticalInkToolbar");
+                Verify.IsNotNull(textBlock, "Verify verticalInkToolbar doesn't crash");
+
+                Log.Comment("Click on " + "InkToolbarBallpointPenButton");
+                var radioButton = new RadioButton(FindElement.ById("InkToolbarBallpointPenButton"));
+                radioButton.Select();
+                Wait.ForIdle();
             }
         }
     }
diff --git a/dev/CommonStyles/TestUI/InkToolbarPage.xaml b/dev/CommonStyles/TestUI/InkToolbarPage.xaml
index 88103c142a..190828404d 100644
--- a/dev/CommonStyles/TestUI/InkToolbarPage.xaml
+++ b/dev/CommonStyles/TestUI/InkToolbarPage.xaml
@@ -4,8 +4,18 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
-    <StackPanel>
-        <InkToolbar TargetInkCanvas="{x:Bind inkCanvas}"/>
-        <InkCanvas x:Name="inkCanvas" Height="400"/>
-    </StackPanel>
+    <Grid>
+        <StackPanel>
+            <InkToolbar x:Name="InkToolbar" TargetInkCanvas="{x:Bind inkCanvas}">
+                <InkToolbarBallpointPenButton x:Name="InkToolbarBallpointPenButton" AutomationProperties.Name="InkToolbarBallpointPenButton"/>
+            </InkToolbar>
+            <InkCanvas x:Name="inkCanvas" Height="400"/>
+        </StackPanel>
+        <StackPanel>
+            <InkToolbar x:Name="VerticalInkToolbar"
+                        VerticalAlignment="Center"
+                        HorizontalAlignment="Right"
+                        Orientation="Vertical"/>
+        </StackPanel>
+    </Grid>
 </Page>