From dc83109e4da171d23afb5f3305d33b5995d7438a Mon Sep 17 00:00:00 2001
From: Andreas <andy.reitberger@gmail.com>
Date: Thu, 19 Sep 2024 10:09:22 +0200
Subject: [PATCH] Fixed `Button` styles

This commit fixes issues with the `VisualStateManager` styles.

Fixed #556
---
 .../Themes/DefaultColors.xaml                 |   2 +-
 .../ViewModels/ButtonsPageViewModel.cs        |   2 +
 .../Views/ButtonsPage.xaml                    | 245 +++++++++++-------
 .../Themes/Controls/Core/Button.xaml          |  68 ++---
 .../Resources/Themes/Controls/Button.xaml     | 238 ++++++++++-------
 5 files changed, 318 insertions(+), 237 deletions(-)

diff --git a/src/SharedMauiXamlStylesLibrary.SampleApp/Themes/DefaultColors.xaml b/src/SharedMauiXamlStylesLibrary.SampleApp/Themes/DefaultColors.xaml
index 6ae25191..f17a3be0 100644
--- a/src/SharedMauiXamlStylesLibrary.SampleApp/Themes/DefaultColors.xaml
+++ b/src/SharedMauiXamlStylesLibrary.SampleApp/Themes/DefaultColors.xaml
@@ -7,7 +7,7 @@
     <!-- https://material.io/design/color/the-color-system.html#tools-for-picking-colors -->
     <!-- Common -->
     <Color x:Key="PrimaryColor">#512BD4</Color>
-    <Color x:Key="PrimaryDarkenColor">#512BD4</Color>
+    <Color x:Key="PrimaryDarkenColor">#391E94</Color>
     <Color x:Key="PrimaryLighterColor">#edcacd</Color>
     <Color x:Key="PrimaryLight">#ffe8f4</Color>
     <Color x:Key="SecondaryGradient">#7644ad</Color>
diff --git a/src/SharedMauiXamlStylesLibrary.SampleApp/ViewModels/ButtonsPageViewModel.cs b/src/SharedMauiXamlStylesLibrary.SampleApp/ViewModels/ButtonsPageViewModel.cs
index 846df1a4..0650c260 100644
--- a/src/SharedMauiXamlStylesLibrary.SampleApp/ViewModels/ButtonsPageViewModel.cs
+++ b/src/SharedMauiXamlStylesLibrary.SampleApp/ViewModels/ButtonsPageViewModel.cs
@@ -10,6 +10,8 @@ public partial class ButtonsPageViewModel : BaseViewModel
         [ObservableProperty]
         string sampleText = "This is just a sample text";
 
+        [ObservableProperty]
+        bool enabled = true;
         #endregion
 
         #region Constructor, LoadSettings
diff --git a/src/SharedMauiXamlStylesLibrary.SampleApp/Views/ButtonsPage.xaml b/src/SharedMauiXamlStylesLibrary.SampleApp/Views/ButtonsPage.xaml
index d3450e42..1881d97f 100644
--- a/src/SharedMauiXamlStylesLibrary.SampleApp/Views/ButtonsPage.xaml
+++ b/src/SharedMauiXamlStylesLibrary.SampleApp/Views/ButtonsPage.xaml
@@ -18,104 +18,149 @@
     <ContentPage.Resources>
         <converters:ColorToBlackWhiteConverter x:Key="ColorToBlackWhiteConverter" />
     </ContentPage.Resources>
-    <ScrollView>
-        <VerticalStackLayout>
-            <Label 
-                Margin="2,16"
-                Text="Text Buttons"
-                VerticalTextAlignment="Center" 
-                HorizontalTextAlignment="Center"
-                Style="{StaticResource Style.Core.Label.Default}"
-                />
-            
-            <Button 
-                Margin="8,16"
-                Text="This is a normal button"
-                Style="{StaticResource Style.Core.Button.Default}"
-                />
-            
-            <Button 
-                Margin="8,16"
-                Text="This is a green button"
-                Style="{StaticResource Style.Core.Button.Default}"
-                Background="Green"
-                />
-            
-            <Button 
-                Margin="8,16"
-                Text="This is a link styled button"
-                Style="{StaticResource Style.Core.Button.Link}"
-                />
-            
-            
-            <Button 
-                Margin="8,16"
-                Text="This is a link styled button with a round frame"
-                Style="{StaticResource Style.Core.Button.LinkRound}"
-                />
-            
-            <Button 
-                Margin="8,16"
-                Text="This is a normal button"
-                Style="{StaticResource Style.Core.Button.RoundedLong}"
-                />
-            
-            <BoxView
-                Style="{StaticResource Style.Core.BoxView.PrimarySeparator}"
-                Margin="4"
-                />
-
-            <Label 
-                Margin="2,16"
-                Text="Icon Buttons"
-                VerticalTextAlignment="Center" 
-                HorizontalTextAlignment="Center"
-                Style="{StaticResource Style.Core.Label.Default}"
-                />
-
-            <Grid
-                ColumnDefinitions="*,*,*"
-                RowDefinitions="*,*"
-                >
-            <Button 
-                Margin="8,16"
-                Text="{x:Static iconsSyncfusion:SyncfusionIcons.Favourite}"
-                Style="{StaticResource Style.Core.Button.IconPrimary}"
-                />
-            <Button 
-                Grid.Column="1"
-                Margin="8,16"
-                Text="{x:Static icons:MaterialIcons.PhonePlusOutline}"
-                Style="{StaticResource Style.Core.Button.IconPrimary.MaterialDesign}"
-                />
-            <Button 
-                Grid.Column="2"
-                Margin="8,16"
-                Text="{x:Static icons:MaterialIcons.ProgressCheck}"
-                Style="{StaticResource Style.Core.Button.IconPrimary.MaterialDesign}"
-                />
-            <Button 
-                Grid.Row="1"
-                Grid.Column="0"
-                Margin="8,16"
-                Text="{x:Static icons:MaterialIcons.ProgressCheck}"
-                Style="{StaticResource Style.Core.Button.IconPrimary.MaterialDesign}"
-                />
-            <Button 
-                Grid.Row="1"
-                Grid.Column="1"
-                Margin="8,16"
-                Text="{x:Static icons:MaterialIcons.AlertCircleCheckOutline}"
-                Style="{StaticResource Style.Core.Button.Icon.MaterialDesign.Critical}"
-                />
-            <Button 
-                Grid.Row="1"
-                Grid.Column="2"
-                Margin="8,16"
-                Text="{x:Static icons:MaterialIcons.ScriptOutline}"
-                Style="{StaticResource Style.Core.Button.Icon.MaterialDesign.Error}"
-                />
-            </Grid>
-        </VerticalStackLayout>
-    </ScrollView>
+    <Grid
+        ColumnDefinitions="*,Auto"
+        RowDefinitions="Auto,*"
+        >
+        <Label
+            Margin="16,8"
+            Text="Switch button enable state"
+            />
+        <Switch
+            Grid.Column="1"
+            IsToggled="{Binding Enabled}"
+            />
+        <ScrollView
+            Grid.ColumnSpan="2"
+            Grid.Row="1"
+            >
+            <VerticalStackLayout>
+                <Label 
+                    Margin="2,16"
+                    Text="Text Buttons"
+                    VerticalTextAlignment="Center" 
+                    HorizontalTextAlignment="Center"
+                    Style="{StaticResource Style.Core.Label.Default}"
+                    />
+                <Button
+                    IsEnabled="{Binding Enabled}"
+                    Margin="8,16"
+                    Text="This is a normal button"
+                    Style="{StaticResource Style.Core.Button.Default}"
+                    />
+                <Button
+                    IsEnabled="{Binding Enabled}"
+                    Margin="8,16"
+                    Text="This is a transparent button"
+                    Style="{StaticResource Style.Core.Button.Default.Transparent}"
+                    />
+                <Button 
+                    IsEnabled="{Binding Enabled}"
+                    Margin="8,16"
+                    Text="This is a green button"
+                    Style="{StaticResource Style.Core.Button.Default}"
+                    Background="Green"
+                    >
+                    <!-- If you change the Background, also remember to also update the PointOver VisualState -->
+                    <VisualStateManager.VisualStateGroups>
+                        <VisualStateGroupList>
+                            <VisualStateGroup x:Name="CommonStates">
+                                <VisualState x:Name="Normal" />
+                                <VisualState x:Name="Disabled">
+                                    <VisualState.Setters>
+                                        <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray800}}" />
+                                        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray400}, Dark={StaticResource Gray600}}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                                <VisualState x:Name="PointerOver" >
+                                    <VisualState.Setters>
+                                        <Setter Property="Background" Value="DarkGreen"/>
+                                        <Setter Property="TextColor" Value="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}" />
+                                    </VisualState.Setters>
+                                </VisualState>
+                            </VisualStateGroup>
+                        </VisualStateGroupList>
+                    </VisualStateManager.VisualStateGroups>
+                </Button>
+                <Button 
+                    IsEnabled="{Binding Enabled}"
+                    Margin="8,16"
+                    Text="This is a link styled button"
+                    Style="{StaticResource Style.Core.Button.Link}"
+                    />
+                <Button 
+                    IsEnabled="{Binding Enabled}"
+                    Margin="8,16"
+                    Text="This is a link styled button with a round frame"
+                    Style="{StaticResource Style.Core.Button.LinkRound}"
+                    />
+                <Button 
+                    IsEnabled="{Binding Enabled}"
+                    Margin="8,16"
+                    Text="This is a normal button"
+                    Style="{StaticResource Style.Core.Button.RoundedLong}"
+                    />
+                <BoxView
+                    Style="{StaticResource Style.Core.BoxView.PrimarySeparator}"
+                    Margin="4"
+                    />
+                <Label 
+                    Margin="2,16"
+                    Text="Icon Buttons"
+                    VerticalTextAlignment="Center" 
+                    HorizontalTextAlignment="Center"
+                    Style="{StaticResource Style.Core.Label.Default}"
+                    />
+                <Grid
+                    ColumnDefinitions="*,*,*"
+                    RowDefinitions="*,*"
+                    >
+                    <Button 
+                        IsEnabled="{Binding Enabled}"
+                        Margin="8,16"
+                        Text="{x:Static iconsSyncfusion:SyncfusionIcons.Favourite}"
+                        Style="{StaticResource Style.Core.Button.IconPrimary}"
+                        />
+                    <Button 
+                        IsEnabled="{Binding Enabled}"
+                        Grid.Column="1"
+                        Margin="8,16"
+                        Text="{x:Static icons:MaterialIcons.PhonePlusOutline}"
+                        Style="{StaticResource Style.Core.Button.IconPrimary.MaterialDesign}"
+                        />
+                    <Button 
+                        IsEnabled="{Binding Enabled}"
+                        Grid.Column="2"
+                        Margin="8,16"
+                        Text="{x:Static icons:MaterialIcons.ProgressCheck}"
+                        Style="{StaticResource Style.Core.Button.IconPrimary.MaterialDesign}"
+                        />
+                    <Button 
+                        IsEnabled="{Binding Enabled}"
+                        Grid.Row="1"
+                        Grid.Column="0"
+                        Margin="8,16"
+                        Text="{x:Static icons:MaterialIcons.ProgressCheck}"
+                        Style="{StaticResource Style.Core.Button.IconPrimary.MaterialDesign}"
+                        />
+                    <Button 
+                        IsEnabled="{Binding Enabled}"
+                        Grid.Row="1"
+                        Grid.Column="1"
+                        Margin="8,16"
+                        Text="{x:Static icons:MaterialIcons.AlertCircleCheckOutline}"
+                        Style="{StaticResource Style.Core.Button.Icon.MaterialDesign.Critical}"
+                        />
+                    <Button 
+                        IsEnabled="{Binding Enabled}"
+                        Grid.Row="1"
+                        Grid.Column="2"
+                        Margin="8,16"
+                        Text="{x:Static icons:MaterialIcons.ScriptOutline}"
+                        Style="{StaticResource Style.Core.Button.Icon.MaterialDesign.Error}"
+                        />
+                </Grid>
+            </VerticalStackLayout>
+        </ScrollView>
+    </Grid>
 </ContentPage>
\ No newline at end of file
diff --git a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/Core/Button.xaml b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/Core/Button.xaml
index dfb63eb3..e2794d11 100644
--- a/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/Core/Button.xaml
+++ b/src/SharedMauiXamlStylesLibrary.Syncfusion/Resources/Themes/Controls/Core/Button.xaml
@@ -24,62 +24,34 @@
     <converters:ColorToLightForgroundConverter x:Key="ColorToLightForgroundConverter"  />
     <converters:BrushToBlackWhiteConverter x:Key="BrushToBlackWhiteConverter" />
 
-    <Style x:Key="Style.Core.Button.Icon" TargetType="Button" BasedOn="{StaticResource Style.Core.Button.Default}">
+    <Style x:Key="Style.Core.Button.Icon" TargetType="Button" BasedOn="{StaticResource Style.Core.Button.Icon.Default}">
+        <Setter Property="FontFamily" Value="{StaticResource FontIcons}" />
+    </Style>
+
+    <Style x:Key="Style.Core.Button.Icon.Transparent" TargetType="Button" BasedOn="{StaticResource Style.Core.Button.Icon.Default.Transparent}">
         <Setter Property="FontFamily" Value="{StaticResource FontIcons}" />
-        <Setter Property="FontSize" Value="{StaticResource LargeIconSize}" />
-        <Setter Property="HeightRequest" Value="{OnIdiom Desktop=60, Tablet=60, Default=50}" />
-        <Setter Property="WidthRequest" Value="{OnIdiom Desktop=60, Tablet=60, Default=50}" />
-        <Setter Property="BorderWidth" Value="0" />
-        <Setter Property="VisualStateManager.VisualStateGroups">
-            <VisualStateGroupList>
-                <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="PointerOver">
-                        <VisualState.Setters>
-                            <Setter Property="Background" Value="{StaticResource Transparent}" />
-                            <Setter Property="TextColor" Value="{DynamicResource PrimaryColor}" />
-                        </VisualState.Setters>
-                    </VisualState>
-                    <VisualState x:Name="Normal">
-                        <VisualState.Setters>
-                            <Setter Property="Background" Value="{StaticResource Transparent}" />
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray600}, Dark={StaticResource Gray400}}" />
-                        </VisualState.Setters>
-                    </VisualState>
-                    <VisualState x:Name="Disabled">
-                        <VisualState.Setters>
-                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray700}}" />
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray800}, Dark={StaticResource Gray200}}" />
-                        </VisualState.Setters>
-                    </VisualState>
-                    <!--
-                    <VisualState x:Name="Focused" />
-                    <VisualState x:Name="Selected" />
-                    -->
-                </VisualStateGroup>
-            </VisualStateGroupList>
-        </Setter>
     </Style>
 
     <Style x:Key="Style.Core.Button.IconPrimary" TargetType="Button" BasedOn="{StaticResource Style.Core.Button.Icon}">
+        <Setter Property="Background" Value="{DynamicResource PrimaryColor}" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="PointerOver">
+                    <VisualState x:Name="Normal">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{DynamicResource PrimaryDarkenColor}" />
                             <Setter Property="TextColor" Value="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}" />
                         </VisualState.Setters>
                     </VisualState>
-                    <VisualState x:Name="Normal">
+                    <VisualState x:Name="PointerOver">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{DynamicResource PrimaryColor}" />
+                            <Setter Property="Background" Value="{DynamicResource PrimaryDarkenColor}" />
                             <Setter Property="TextColor" Value="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}" />
                         </VisualState.Setters>
                     </VisualState>
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray700}}" />
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray800}, Dark={StaticResource Gray200}}" />
+                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray800}}" />
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray400}, Dark={StaticResource Gray600}}" />
                         </VisualState.Setters>
                     </VisualState>
                     <!--
@@ -92,6 +64,7 @@
     </Style>
 
     <Style x:Key="Style.Core.Button.IconRound" BasedOn="{StaticResource Style.Core.Button.Icon}" TargetType="Button">
+        <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray100}, Dark={StaticResource Gray900}}" />
         <Setter Property="FontSize" Value="{StaticResource LargeTextSize}" />
         <Setter Property="BorderWidth" Value="1" />
         <Setter Property="HeightRequest" Value="{OnIdiom Desktop=64, Tablet=64, Default=50}" />
@@ -100,6 +73,12 @@
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
+                    <VisualState x:Name="Normal">
+                        <VisualState.Setters>
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray800}, Dark={StaticResource Gray200}}" />
+                            <Setter Property="BorderColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray700}}" />
+                        </VisualState.Setters>
+                    </VisualState>
                     <VisualState x:Name="PointerOver">
                         <VisualState.Setters>
                             <Setter Property="Background" Value="{DynamicResource PrimaryColor}" />
@@ -107,17 +86,10 @@
                             <Setter Property="BorderColor" Value="{DynamicResource PrimaryDarkenColor}" />
                         </VisualState.Setters>
                     </VisualState>
-                    <VisualState x:Name="Normal">
-                        <VisualState.Setters>
-                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray100}, Dark={StaticResource Gray900}}" />
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray800}, Dark={StaticResource Gray200}}" />
-                            <Setter Property="BorderColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray700}}" />
-                        </VisualState.Setters>
-                    </VisualState>
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray700}}" />
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray800}, Dark={StaticResource Gray200}}" />
+                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray800}}" />
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray400}, Dark={StaticResource Gray600}}" />
                         </VisualState.Setters>
                     </VisualState>
                     <!--
diff --git a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Button.xaml b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Button.xaml
index 681d1be2..74779e9b 100644
--- a/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Button.xaml
+++ b/src/SharedMauiXamlStylesLibrary/Resources/Themes/Controls/Button.xaml
@@ -29,25 +29,24 @@
         <Setter Property="MinimumHeightRequest" Value="50" />
         <Setter Property="BorderWidth" Value="0" />
         <Setter Property="ContentLayout" Value="Left, 10" />
+        <Setter Property="Background" Value="{DynamicResource PrimaryColor}"/>
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
                     <VisualState x:Name="Normal">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{DynamicResource PrimaryColor}"/>
                             <Setter Property="TextColor" Value="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}" />
                         </VisualState.Setters>
                     </VisualState>
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource LightGray}, Dark={StaticResource DarkGray}}" />
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource DarkGray}, Dark={StaticResource LightGray}}" />
+                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray800}}" />
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray400}, Dark={StaticResource Gray600}}" />
                         </VisualState.Setters>
                     </VisualState>
                     <VisualState x:Name="PointerOver" >
                         <VisualState.Setters>
                             <Setter Property="Background" Value="{DynamicResource PrimaryDarkenColor}"/>
-                            <!--<Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray950}, Dark={StaticResource Gray50}}"/>-->
                             <Setter Property="TextColor" Value="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}" />
                         </VisualState.Setters>
                     </VisualState>
@@ -59,32 +58,63 @@
             </VisualStateGroupList>
         </Setter>
     </Style>
+
+    <Style x:Key="Style.Core.Button.Default.Transparent" TargetType="Button" BasedOn="{StaticResource Style.Core.Button.Default}">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="VisualStateManager.VisualStateGroups">
+            <VisualStateGroupList>
+                <VisualStateGroup x:Name="CommonStates">
+                    <VisualState x:Name="Normal">
+                        <VisualState.Setters>
+                            <Setter Property="TextColor" Value="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}" />
+                        </VisualState.Setters>
+                    </VisualState>
+                    <VisualState x:Name="PointerOver" >
+                        <VisualState.Setters>
+                            <Setter Property="Background" Value="Transparent"/>
+                            <Setter Property="TextColor" Value="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}" />
+                        </VisualState.Setters>
+                    </VisualState>
+                    <VisualState x:Name="Disabled">
+                        <VisualState.Setters>
+                            <Setter Property="Background" Value="Transparent"/>
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray400}, Dark={StaticResource Gray600}}" />
+                        </VisualState.Setters>
+                    </VisualState>
+                    <!--
+                    <VisualState x:Name="Focused" />
+                    <VisualState x:Name="Selected" />
+                    -->
+                </VisualStateGroup>
+            </VisualStateGroupList>
+        </Setter>
+    </Style>
     
     <Style TargetType="Button" BasedOn="{StaticResource Style.Core.Button.Default}"/>
 
     <Style x:Key="Style.Core.Button.Header" TargetType="Button" BasedOn="{StaticResource Style.Core.Button.Default}">
+        <Setter Property="Background" Value="{DynamicResource PrimaryColor}"/>
         <Setter Property="FontFamily" Value="{StaticResource MontserratSemiBold}" />
         <Setter Property="FontSize" Value="{StaticResource DefaultTextSize}" />
         <Setter Property="MinimumHeightRequest" Value="50" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="PointerOver">
+                    <VisualState x:Name="Normal">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{DynamicResource PrimaryDarkenColor}"/>
                             <Setter Property="TextColor" Value="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}" />
                         </VisualState.Setters>
                     </VisualState>
-                    <VisualState x:Name="Normal">
+                    <VisualState x:Name="PointerOver">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{DynamicResource PrimaryColor}"/>
+                            <Setter Property="Background" Value="{DynamicResource PrimaryDarkenColor}"/>
                             <Setter Property="TextColor" Value="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}" />
                         </VisualState.Setters>
                     </VisualState>
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource LightGray}, Dark={StaticResource DarkGray}}" />
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource DarkGray}, Dark={StaticResource LightGray}}" />
+                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray800}}" />
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray400}, Dark={StaticResource Gray600}}" />
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>
@@ -117,26 +147,52 @@
 
     <Style TargetType="ImageButton" BasedOn="{StaticResource Style.Core.ImageButton.Default}"/>
 
-    <Style x:Key="Style.Core.Button.Icon.MaterialDesign" TargetType="Button" BasedOn="{StaticResource Style.Core.Button.Default}">
-        <Setter Property="FontFamily" Value="{StaticResource MaterialDesignIcons}" />
-        <Setter Property="FontSize" Value="{StaticResource LargeIconSize}" />
-        <!--
+    <Style x:Key="Style.Core.Button.Icon.Default" TargetType="Button" BasedOn="{StaticResource Style.Core.Button.Default}">
         <Setter Property="Background" Value="{StaticResource Transparent}" />
-        <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray600}, Dark={StaticResource Gray400}}" />
-        -->
+        <Setter Property="FontSize" Value="{StaticResource LargeIconSize}" />
         <Setter Property="HeightRequest" Value="{OnIdiom Desktop=60, Tablet=60, Default=50}" />
         <Setter Property="WidthRequest" Value="{OnIdiom Desktop=60, Tablet=60, Default=50}" />
         <Setter Property="BorderWidth" Value="0" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
+                    <VisualState x:Name="Normal">
+                        <VisualState.Setters>
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray600}, Dark={StaticResource Gray400}}" />
+                        </VisualState.Setters>
+                    </VisualState>
                     <VisualState x:Name="PointerOver">
                         <VisualState.Setters>
                             <Setter Property="Background" Value="{StaticResource Transparent}" />
                             <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray600}, Dark={StaticResource Gray400}}" />
                         </VisualState.Setters>
                     </VisualState>
+                    <VisualState x:Name="Disabled">
+                        <VisualState.Setters>
+                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray800}}" />
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray400}, Dark={StaticResource Gray600}}" />
+                        </VisualState.Setters>
+                    </VisualState>
+                    <!--
+                    <VisualState x:Name="Focused" />
+                    <VisualState x:Name="Selected" />
+                    -->
+                </VisualStateGroup>
+            </VisualStateGroupList>
+        </Setter>
+    </Style>
+
+    <Style x:Key="Style.Core.Button.Icon.Default.Transparent" TargetType="Button" BasedOn="{StaticResource Style.Core.Button.Icon.Default}">
+        <Setter Property="Background" Value="Transparent"/>
+        <Setter Property="VisualStateManager.VisualStateGroups">
+            <VisualStateGroupList>
+                <VisualStateGroup x:Name="CommonStates">
                     <VisualState x:Name="Normal">
+                        <VisualState.Setters>
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray600}, Dark={StaticResource Gray400}}" />
+                        </VisualState.Setters>
+                    </VisualState>
+                    <VisualState x:Name="PointerOver">
                         <VisualState.Setters>
                             <Setter Property="Background" Value="{StaticResource Transparent}" />
                             <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray600}, Dark={StaticResource Gray400}}" />
@@ -144,8 +200,8 @@
                     </VisualState>
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray700}}" />
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray800}, Dark={StaticResource Gray200}}" />
+                            <Setter Property="Background" Value="{StaticResource Transparent}" />
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray400}, Dark={StaticResource Gray600}}" />
                         </VisualState.Setters>
                     </VisualState>
                     <!--
@@ -157,26 +213,34 @@
         </Setter>
     </Style>
 
-    <Style x:Key="Style.Core.Button.Icon.MaterialDesign.Critical" TargetType="Button" BasedOn="{StaticResource Style.Core.Button.Icon.MaterialDesign}">
+    <Style x:Key="Style.Core.Button.Icon.MaterialDesign" TargetType="Button" BasedOn="{StaticResource Style.Core.Button.Icon.Default}">
+        <Setter Property="FontFamily" Value="{StaticResource MaterialDesignIcons}" />
+    </Style>
+
+    <Style x:Key="Style.Core.Button.Icon.Transparent.MaterialDesign" TargetType="Button" BasedOn="{StaticResource Style.Core.Button.Icon.Default.Transparent}">
+        <Setter Property="FontFamily" Value="{StaticResource MaterialDesignIcons}" />
+    </Style>
+
+    <Style x:Key="Style.Core.Button.Icon.MaterialDesign.Critical" TargetType="Button" BasedOn="{StaticResource Style.Core.Button.Icon.Transparent.MaterialDesign}">
+        <Setter Property="Background" Value="{StaticResource Transparent}" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="PointerOver" >
+                    <VisualState x:Name="Normal">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{StaticResource Transparent}" />
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Yellow100Accent}, Dark={StaticResource Yellow100Accent}}" />
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Yellow}, Dark={StaticResource Yellow}}" />
                         </VisualState.Setters>
                     </VisualState>
-                    <VisualState x:Name="Normal">
+                    <VisualState x:Name="PointerOver" >
                         <VisualState.Setters>
                             <Setter Property="Background" Value="{StaticResource Transparent}" />
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Yellow}, Dark={StaticResource Yellow}}" />
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Yellow100Accent}, Dark={StaticResource Yellow100Accent}}" />
                         </VisualState.Setters>
                     </VisualState>
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray100}, Dark={StaticResource Gray900}}" />
-                            <Setter Property="TextColor" Value="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}" />
+                            <Setter Property="Background" Value="{StaticResource Transparent}" />
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray400}, Dark={StaticResource Gray600}}" />
                         </VisualState.Setters>
                     </VisualState>
                     <!--
@@ -188,17 +252,17 @@
         </Setter>
     </Style>
 
-    <Style x:Key="Style.Core.Button.Icon.MaterialDesign.Error" TargetType="Button" BasedOn="{StaticResource Style.Core.Button.Icon.MaterialDesign}">
+    <Style x:Key="Style.Core.Button.Icon.MaterialDesign.Error" TargetType="Button" BasedOn="{StaticResource Style.Core.Button.Icon.Transparent.MaterialDesign}">
+        <Setter Property="Background" Value="{StaticResource Transparent}" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="PointerOver" >
+                    <VisualState x:Name="Normal">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{StaticResource Transparent}" />
                             <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Light_Error}, Dark={StaticResource Dark_Error}}" />
                         </VisualState.Setters>
                     </VisualState>
-                    <VisualState x:Name="Normal">
+                    <VisualState x:Name="PointerOver" >
                         <VisualState.Setters>
                             <Setter Property="Background" Value="{StaticResource Transparent}" />
                             <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Light_Error}, Dark={StaticResource Dark_Error}}" />
@@ -206,8 +270,8 @@
                     </VisualState>
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray100}, Dark={StaticResource Gray900}}" />
-                            <Setter Property="TextColor" Value="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}" />
+                            <Setter Property="Background" Value="{StaticResource Transparent}" />
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray400}, Dark={StaticResource Gray600}}" />
                         </VisualState.Setters>
                     </VisualState>
                     <!--
@@ -231,22 +295,21 @@
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="PointerOver">
+                    <VisualState x:Name="Normal">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{DynamicResource PrimaryDarkenColor}" />
                             <Setter Property="TextColor" Value="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}" />
                         </VisualState.Setters>
                     </VisualState>
-                    <VisualState x:Name="Normal">
+                    <VisualState x:Name="PointerOver">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{DynamicResource PrimaryColor}" />
+                            <Setter Property="Background" Value="{DynamicResource PrimaryDarkenColor}" />
                             <Setter Property="TextColor" Value="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}" />
                         </VisualState.Setters>
                     </VisualState>
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource LightGray}, Dark={StaticResource DarkGray}}" />
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource DarkGray}, Dark={StaticResource LightGray}}" />
+                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray800}}" />
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray400}, Dark={StaticResource Gray600}}" />
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>
@@ -255,28 +318,28 @@
     </Style>
 
     <Style x:Key="Style.Core.Button.Link" TargetType="Button" BasedOn="{StaticResource Style.Core.Button.Default}">
+        <Setter Property="Background" Value="{StaticResource Transparent}"/>
         <Setter Property="BorderWidth" Value="0" />
         <Setter Property="Margin" Value="4,6" />
         <Setter Property="FontSize" Value="{StaticResource DefaultTextSize}" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="PointerOver" >
+                    <VisualState x:Name="Normal">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{StaticResource Transparent}"/>
-                            <Setter Property="TextColor" Value="{StaticResource LightBlue}" />
+                            <Setter Property="TextColor" Value="{StaticResource Blue}" />
                         </VisualState.Setters>
                     </VisualState>
-                    <VisualState x:Name="Normal">
+                    <VisualState x:Name="PointerOver" >
                         <VisualState.Setters>
                             <Setter Property="Background" Value="{StaticResource Transparent}"/>
-                            <Setter Property="TextColor" Value="{StaticResource Blue}" />
+                            <Setter Property="TextColor" Value="{StaticResource LightBlue}" />
                         </VisualState.Setters>
                     </VisualState>
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource LightGray}, Dark={StaticResource DarkGray}}" />
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource DarkGray}, Dark={StaticResource LightGray}}" />
+                            <Setter Property="Background" Value="{StaticResource Transparent}"/>
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray400}, Dark={StaticResource Gray600}}" />
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>
@@ -285,31 +348,31 @@
     </Style>
 
     <Style x:Key="Style.Core.Button.LinkRound" TargetType="Button" BasedOn="{StaticResource Style.Core.Button.Link}">
+        <Setter Property="Background" Value="Transparent"/>
         <Setter Property="BorderWidth" Value="2" />
         <Setter Property="HeightRequest" Value="50" />
         <Setter Property="CornerRadius" Value="25" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="PointerOver" >
-                        <VisualState.Setters>
-                            <Setter Property="Background" Value="{StaticResource Transparent}"/>
-                            <Setter Property="TextColor" Value="{StaticResource LightBlue}" />
-                            <Setter Property="BorderColor" Value="{StaticResource LightBlue}" />
-                        </VisualState.Setters>
-                    </VisualState>
                     <VisualState x:Name="Normal">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{StaticResource Transparent}"/>
                             <Setter Property="TextColor" Value="{StaticResource Blue}" />
                             <Setter Property="BorderColor" Value="{StaticResource Blue}" />
                         </VisualState.Setters>
                     </VisualState>
+                    <VisualState x:Name="PointerOver" >
+                        <VisualState.Setters>
+                            <Setter Property="Background" Value="Transparent"/>
+                            <Setter Property="TextColor" Value="{StaticResource LightBlue}" />
+                            <Setter Property="BorderColor" Value="{StaticResource LightBlue}" />
+                        </VisualState.Setters>
+                    </VisualState>
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource LightGray}, Dark={StaticResource DarkGray}}" />
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource DarkGray}, Dark={StaticResource LightGray}}" />
-                            <Setter Property="BorderColor" Value="{AppThemeBinding Light={StaticResource DarkGray}, Dark={StaticResource LightGray}}" />
+                            <Setter Property="Background" Value="Transparent"/>
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray400}, Dark={StaticResource Gray600}}" />
+                            <Setter Property="BorderColor" Value="{AppThemeBinding Light={StaticResource Gray400}, Dark={StaticResource Gray600}}" />
                         </VisualState.Setters>
                     </VisualState>
                 </VisualStateGroup>
@@ -318,6 +381,7 @@
     </Style>
 
     <Style x:Key="Style.Core.Button.IconRound.MaterialDesign" BasedOn="{StaticResource Style.Core.Button.Icon.MaterialDesign}" TargetType="Button">
+        <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray100}, Dark={StaticResource Gray900}}" />
         <Setter Property="FontSize" Value="{StaticResource LargeTextSize}" />
         <Setter Property="BorderWidth" Value="1" />
         <Setter Property="HeightRequest" Value="{OnIdiom Desktop=64, Tablet=64, Default=50}" />
@@ -326,6 +390,12 @@
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
+                    <VisualState x:Name="Normal">
+                        <VisualState.Setters>
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray800}, Dark={StaticResource Gray200}}" />
+                            <Setter Property="BorderColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray700}}" />
+                        </VisualState.Setters>
+                    </VisualState>
                     <VisualState x:Name="PointerOver">
                         <VisualState.Setters>
                             <Setter Property="Background" Value="{DynamicResource PrimaryColor}" />
@@ -333,50 +403,42 @@
                             <Setter Property="BorderColor" Value="{DynamicResource PrimaryDarkenColor}" />
                         </VisualState.Setters>
                     </VisualState>
-                    <VisualState x:Name="Normal">
-                        <VisualState.Setters>
-                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray100}, Dark={StaticResource Gray900}}" />
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray800}, Dark={StaticResource Gray200}}" />
-                            <Setter Property="BorderColor" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray700}}" />
-                        </VisualState.Setters>
-                    </VisualState>
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray700}}" />
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray800}, Dark={StaticResource Gray200}}" />
+                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray800}}" />
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray400}, Dark={StaticResource Gray600}}" />
                         </VisualState.Setters>
                     </VisualState>
                     <!--
-            <VisualState x:Name="Focused" />
-            <VisualState x:Name="Selected" />
-            -->
+                    <VisualState x:Name="Focused" />
+                    <VisualState x:Name="Selected" />
+                    -->
                 </VisualStateGroup>
             </VisualStateGroupList>
         </Setter>
     </Style>
 
     <Style x:Key="Style.Core.Button.IconRound.MaterialDesign.Transparent" TargetType="Button" BasedOn="{StaticResource Style.Core.Button.IconRound.MaterialDesign}">
+        <Setter Property="Background" Value="Transparent" />
         <Setter Property="BorderWidth" Value="0" />
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="PointerOver">
+                    <VisualState x:Name="Normal">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="Transparent" />
-                            <!--<Setter Property="Background" Value="{DynamicResource PrimaryColor}" />-->
-                            <Setter Property="TextColor" Value="{DynamicResource PrimaryColor}" />
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray600}, Dark={StaticResource Gray400}}" />
                         </VisualState.Setters>
                     </VisualState>
-                    <VisualState x:Name="Normal">
+                    <VisualState x:Name="PointerOver">
                         <VisualState.Setters>
                             <Setter Property="Background" Value="Transparent" />
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray600}, Dark={StaticResource Gray400}}" />
+                            <Setter Property="TextColor" Value="{DynamicResource PrimaryColor}" />
                         </VisualState.Setters>
                     </VisualState>
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray300}, Dark={StaticResource Gray700}}" />
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray800}, Dark={StaticResource Gray200}}" />
+                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray800}}" />
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray400}, Dark={StaticResource Gray600}}" />
                         </VisualState.Setters>
                     </VisualState>
                     <!--
@@ -400,25 +462,25 @@
     </Style>
 
     <Style x:Key="Style.Core.Button.RoundedLong.Critical" TargetType="Button" BasedOn="{StaticResource Style.Core.Button.RoundedLong}">
+        <Setter Property="Background" Value="{StaticResource Red}"/>
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="PointerOver" >
+                    <VisualState x:Name="Normal">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{StaticResource DarkRed}"/>
                             <Setter Property="TextColor" Value="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}" />
                         </VisualState.Setters>
                     </VisualState>
-                    <VisualState x:Name="Normal">
+                    <VisualState x:Name="PointerOver" >
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{StaticResource Red}"/>
+                            <Setter Property="Background" Value="{StaticResource DarkRed}"/>
                             <Setter Property="TextColor" Value="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}" />
                         </VisualState.Setters>
                     </VisualState>
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource LightGray}, Dark={StaticResource DarkGray}}" />
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource DarkGray}, Dark={StaticResource LightGray}}" />
+                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray800}}" />
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray400}, Dark={StaticResource Gray600}}" />
                         </VisualState.Setters>
                     </VisualState>
                     <!--
@@ -436,25 +498,25 @@
     </Style>
 
     <Style x:Key="Style.Core.Button.Error" TargetType="Button" BasedOn="{StaticResource Style.Core.Button.RoundedLong}">
+        <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Light_OnError}, Dark={StaticResource Dark_OnError}}"/>
         <Setter Property="VisualStateManager.VisualStateGroups">
             <VisualStateGroupList>
                 <VisualStateGroup x:Name="CommonStates">
-                    <VisualState x:Name="PointerOver" >
+                    <VisualState x:Name="Normal">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray100}, Dark={StaticResource Gray900}}"/>
                             <Setter Property="TextColor" Value="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}" />
                         </VisualState.Setters>
                     </VisualState>
-                    <VisualState x:Name="Normal">
+                    <VisualState x:Name="PointerOver" >
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Light_OnError}, Dark={StaticResource Dark_OnError}}"/>
+                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray100}, Dark={StaticResource Gray900}}"/>
                             <Setter Property="TextColor" Value="{Binding Source={RelativeSource Self}, Path=Background, Converter={StaticResource BrushToBlackWhiteConverter}}" />
                         </VisualState.Setters>
                     </VisualState>
                     <VisualState x:Name="Disabled">
                         <VisualState.Setters>
-                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource LightGray}, Dark={StaticResource DarkGray}}" />
-                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource DarkGray}, Dark={StaticResource LightGray}}" />
+                            <Setter Property="Background" Value="{AppThemeBinding Light={StaticResource Gray200}, Dark={StaticResource Gray800}}" />
+                            <Setter Property="TextColor" Value="{AppThemeBinding Light={StaticResource Gray400}, Dark={StaticResource Gray600}}" />
                         </VisualState.Setters>
                     </VisualState>
                     <!--