diff --git a/StatisticsAnalysisTool/StatisitcsAnalysisTool.IntegrationTests/ApiController.cs b/StatisticsAnalysisTool/StatisitcsAnalysisTool.IntegrationTests/ApiControllerTests.cs
similarity index 99%
rename from StatisticsAnalysisTool/StatisitcsAnalysisTool.IntegrationTests/ApiController.cs
rename to StatisticsAnalysisTool/StatisitcsAnalysisTool.IntegrationTests/ApiControllerTests.cs
index 01657c4fb..947c82bfa 100644
--- a/StatisticsAnalysisTool/StatisitcsAnalysisTool.IntegrationTests/ApiController.cs
+++ b/StatisticsAnalysisTool/StatisitcsAnalysisTool.IntegrationTests/ApiControllerTests.cs
@@ -8,7 +8,7 @@
 namespace StatisticsAnalysisTool.IntegrationTests
 {
     [TestClass]
-    public class ApiController
+    public class ApiControllerTests
     {
         [TestMethod]
         public void GetItemInfoFromJsonAsync_WithValidValues_ItemInformation()
diff --git a/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml b/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml
index 2fd241cf0..de4d847b6 100644
--- a/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml
+++ b/StatisticsAnalysisTool/StatisticsAnalysisTool/App.xaml
@@ -66,7 +66,14 @@
         <Color x:Key="Color.Text.ToOldSecond">#FF77778C</Color>
         <Color x:Key="Color.Text.ToOldThird">#FF616172</Color>
         <Color x:Key="Color.Text.NoValue">#FF4B4B59</Color>
-        
+
+        <!-- Button colors -->
+        <Color x:Key="ControlNormalColor">#FF0e89b1</Color>
+        <Color x:Key="ControlMouseOverColor">#ff3da2ca</Color>
+        <Color x:Key="DisabledControlColor">#FF4B4B59</Color>
+        <Color x:Key="DisabledForegroundColor">#FFBFBFBF</Color>
+        <Color x:Key="ControlPressedColor">#ff57b6e0</Color>
+
         <SolidColorBrush x:Key="SolidColorBrush.Foreground.First" Color="Gainsboro"/>
         <SolidColorBrush x:Key="SolidColorBrush.Foreground.Second" Color="#B4B4B4"/>
         <SolidColorBrush x:Key="SolidColorBrush.Background.First" Color="{StaticResource Background.First}" />
@@ -565,40 +572,81 @@
             </Style.Triggers>
         </Style>
 
-        <!-- Normal Button Style -->
-        <Style x:Key="ButtonStyle" TargetType="{x:Type Button}">
-            <Setter Property="BorderBrush">
+        <Style x:Key="ButtonFocusVisual">
+            <Setter Property="Control.Template">
                 <Setter.Value>
-                    <SolidColorBrush Color="{StaticResource Color.Blue.3}"/>
+                    <ControlTemplate>
+                        <Border>
+                            <Rectangle Margin="2" StrokeThickness="1" Stroke="#FF4B4B59" StrokeDashArray="1 2" />
+                        </Border>
+                    </ControlTemplate>
                 </Setter.Value>
             </Setter>
+        </Style>
+
+        <!-- Normal Button Style -->
+        <Style x:Key="ButtonStyle" TargetType="{x:Type Button}">
+            <Setter Property="SnapsToDevicePixels" Value="true" />
+            <Setter Property="OverridesDefaultStyle" Value="true" />
+            <Setter Property="FocusVisualStyle" Value="{StaticResource ButtonFocusVisual}" />
+            <Setter Property="MinHeight" Value="18px" />
+            <Setter Property="MinWidth"  Value="40px" />
+            <Setter Property="Foreground" Value="{StaticResource SolidColorBrush.Foreground.First}" />
             <Setter Property="Template">
                 <Setter.Value>
                     <ControlTemplate TargetType="Button">
-                        <Border BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="1" CornerRadius="0">
-                            <Border.Effect>
-                                <DropShadowEffect Color="{StaticResource Color.Blue.3}" ShadowDepth="0"/>
-                            </Border.Effect>
-                            <TextBlock Foreground="{TemplateBinding BorderBrush}" Text="{TemplateBinding Content}" 
-                                       HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                        <Border TextBlock.Foreground="{TemplateBinding Foreground}" x:Name="Border">
+                            <Border.Background>
+                                <SolidColorBrush  Color="{DynamicResource ControlNormalColor}" />
+                            </Border.Background>
+                            <VisualStateManager.VisualStateGroups>
+                                <VisualStateGroup x:Name="CommonStates">
+                                    <VisualStateGroup.Transitions>
+                                        <VisualTransition GeneratedDuration="0:0:0.1" />
+                                        <VisualTransition GeneratedDuration="0" To="Pressed" />
+                                    </VisualStateGroup.Transitions>
+                                    <VisualState x:Name="Normal" />
+                                    <VisualState x:Name="MouseOver">
+                                        <Storyboard>
+                                            <ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)"
+                                                Storyboard.TargetName="Border">
+                                                <EasingColorKeyFrame KeyTime="0" Value="{StaticResource ControlMouseOverColor}" />
+                                            </ColorAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualState>
+                                    <VisualState x:Name="Pressed">
+                                        <Storyboard>
+                                            <ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)"
+                                                Storyboard.TargetName="Border">
+                                                <EasingColorKeyFrame KeyTime="0" Value="{StaticResource ControlPressedColor}" />
+                                            </ColorAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualState>
+                                    <VisualState x:Name="Disabled">
+                                        <Storyboard>
+                                            <ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(Panel.Background).(SolidColorBrush.Color)"
+                                                Storyboard.TargetName="Border">
+                                                <EasingColorKeyFrame KeyTime="0" Value="{StaticResource DisabledControlColor}" />
+                                            </ColorAnimationUsingKeyFrames>
+                                            <ColorAnimationUsingKeyFrames Storyboard.TargetProperty="(TextBlock.Foreground).(SolidColorBrush.Color)"
+                                                Storyboard.TargetName="Border">
+                                                <EasingColorKeyFrame KeyTime="0" Value="{StaticResource DisabledForegroundColor}" />
+                                            </ColorAnimationUsingKeyFrames>
+                                        </Storyboard>
+                                    </VisualState>
+                                </VisualStateGroup>
+                            </VisualStateManager.VisualStateGroups>
+                            <ContentPresenter Margin="2"
+                            HorizontalAlignment="Center"
+                            VerticalAlignment="Center"
+                            RecognizesAccessKey="True" />
                         </Border>
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
-            <Style.Triggers>
-                <Trigger Property="IsMouseOver" Value="True">
-                    <Setter Property="Foreground" Value="{StaticResource SolidColorBrush.Color.Button.First}" />
-                    <Setter Property="Background" Value="{StaticResource SolidColorBrush.Color.Button.First}"/>
-                    <Setter Property="BorderBrush" Value="{StaticResource SolidColorBrush.Color.Button.First}"/>
-                </Trigger>
-                <Trigger Property="IsPressed" Value="True">
-                    <Setter Property="Background" Value="{StaticResource SolidColorBrush.Color.Button.Second}" />
-                    <Setter Property="BorderBrush" Value="{StaticResource SolidColorBrush.Color.Button.Second}"/>
-                </Trigger>
-            </Style.Triggers>
         </Style>
 
-        <!-- Separator -->
+        <!-- Separator 
         <Style TargetType="Separator">
             <Setter Property="Background">
                 <Setter.Value>
@@ -608,7 +656,7 @@
                     </RadialGradientBrush>
                 </Setter.Value>
             </Setter>
-        </Style>
+        </Style> -->
 
         <!-- PlayerMode label value last -->
         <Style TargetType="Label" x:Key="PlayerMode.Label.Value.Last">