diff --git a/Correlator/Views/BigPictureView.xaml b/Correlator/Views/BigPictureView.xaml
index f45a8bb..36104fd 100644
--- a/Correlator/Views/BigPictureView.xaml
+++ b/Correlator/Views/BigPictureView.xaml
@@ -3,7 +3,6 @@
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
-    xmlns:hc="https://handyorg.github.io/handycontrol"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:prism="http://prismlibrary.com/"
     xmlns:vm="clr-namespace:Correlator.ViewModels"
@@ -29,21 +28,33 @@
             Width="90"
             Height="90"
             Margin="0,0,11,11"
-            Padding="11"
-            HorizontalAlignment="Right"
-            VerticalAlignment="Bottom"
-            HorizontalContentAlignment="Right"
-            VerticalContentAlignment="Bottom"
-            hc:BackgroundSwitchElement.MouseDownBackground="{DynamicResource DarkDangerBrush}"
-            hc:BackgroundSwitchElement.MouseHoverBackground="{DynamicResource DangerBrush}"
-            hc:BorderElement.CornerRadius="90 0 0 0"
-            Background="LightGray"
-            BorderThickness="0"
             Command="{Binding CloseWindowCommand}"
             Content=""
-            FontFamily="/Correlator;component/Fonts/#iconfont"
-            FontSize="50"
-            Foreground="White"
-            Style="{StaticResource ButtonCustom}" />
+            FontFamily="/Correlator;component/Fonts/#iconfont">
+            <Button.Style>
+                <Style TargetType="Button">
+                    <Setter Property="HorizontalContentAlignment" Value="Right" />
+                    <Setter Property="VerticalContentAlignment" Value="Bottom" />
+                    <Setter Property="HorizontalAlignment" Value="Right" />
+                    <Setter Property="VerticalAlignment" Value="Bottom" />
+                    <Setter Property="Foreground" Value="White" />
+                    <Setter Property="FontSize" Value="50" />
+                    <Setter Property="Template">
+                        <Setter.Value>
+                            <ControlTemplate TargetType="Button">
+                                <Border
+                                    x:Name="ButtonContainerBorder"
+                                    Padding="0,0,11,11"
+                                    Background="Red"
+                                    BorderThickness="0"
+                                    CornerRadius="90 0 0 0">
+                                    <ContentPresenter HorizontalAlignment="{TemplateBinding HorizontalAlignment}" VerticalAlignment="{TemplateBinding VerticalAlignment}" />
+                                </Border>
+                            </ControlTemplate>
+                        </Setter.Value>
+                    </Setter>
+                </Style>
+            </Button.Style>
+        </Button>
     </Grid>
 </UserControl>
\ No newline at end of file