diff --git a/SpineViewer/Views/ExporterDialogs/CustomFFmpegExporterDialog.xaml b/SpineViewer/Views/ExporterDialogs/CustomFFmpegExporterDialog.xaml
index 6843ebe..12fd91e 100644
--- a/SpineViewer/Views/ExporterDialogs/CustomFFmpegExporterDialog.xaml
+++ b/SpineViewer/Views/ExporterDialogs/CustomFFmpegExporterDialog.xaml
@@ -114,14 +114,15 @@
                                             <hc:ColorPicker Confirmed="ColorPicker_Confirmed" Canceled="ColorPicker_Canceled"/>
                                         </Popup>
                                     </Border>
-                                    <Button DockPanel.Dock="Right" 
-                                            Content="..." 
-                                            Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
-                                            Click="ButtonPickColor_Click">
-                                        <Button.Background>
-                                            <SolidColorBrush Color="{Binding BackgroundColor}"/>
-                                        </Button.Background>
-                                    </Button>
+                                    <Border DockPanel.Dock="Right" Background="White" CornerRadius="{DynamicResource DefaultCornerRadius}">
+                                        <Button Content="..." 
+                                                Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
+                                                Click="ButtonPickColor_Click">
+                                            <Button.Background>
+                                                <SolidColorBrush Color="{Binding BackgroundColor}"/>
+                                            </Button.Background>
+                                        </Button>
+                                    </Border>
                                     <TextBox Text="{Binding BackgroundColor}" ToolTip="#AARRGGBB"/>
                                 </DockPanel>
                             </Grid>
diff --git a/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml b/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml
index f6f3c75..5628be4 100644
--- a/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml
+++ b/SpineViewer/Views/ExporterDialogs/FFmpegVideoExporterDialog.xaml
@@ -114,14 +114,15 @@
                                             <hc:ColorPicker Confirmed="ColorPicker_Confirmed" Canceled="ColorPicker_Canceled"/>
                                         </Popup>
                                     </Border>
-                                    <Button DockPanel.Dock="Right" 
-                                            Content="..." 
-                                            Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
-                                            Click="ButtonPickColor_Click">
-                                        <Button.Background>
-                                            <SolidColorBrush Color="{Binding BackgroundColor}"/>
-                                        </Button.Background>
-                                    </Button>
+                                    <Border DockPanel.Dock="Right" Background="White" CornerRadius="{DynamicResource DefaultCornerRadius}">
+                                        <Button Content="..." 
+                                                Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
+                                                Click="ButtonPickColor_Click">
+                                            <Button.Background>
+                                                <SolidColorBrush Color="{Binding BackgroundColor}"/>
+                                            </Button.Background>
+                                        </Button>
+                                    </Border>
                                     <TextBox Text="{Binding BackgroundColor}" ToolTip="#AARRGGBB"/>
                                 </DockPanel>
                             </Grid>
diff --git a/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml b/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml
index 9feab6c..12ca688 100644
--- a/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml
+++ b/SpineViewer/Views/ExporterDialogs/FrameExporterDialog.xaml
@@ -114,14 +114,15 @@
                                             <hc:ColorPicker Confirmed="ColorPicker_Confirmed" Canceled="ColorPicker_Canceled"/>
                                         </Popup>
                                     </Border>
-                                    <Button DockPanel.Dock="Right" 
-                                            Content="..." 
-                                            Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
-                                            Click="ButtonPickColor_Click">
-                                        <Button.Background>
-                                            <SolidColorBrush Color="{Binding BackgroundColor}"/>
-                                        </Button.Background>
-                                    </Button>
+                                    <Border DockPanel.Dock="Right" Background="White" CornerRadius="{DynamicResource DefaultCornerRadius}">
+                                        <Button Content="..." 
+                                                Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
+                                                Click="ButtonPickColor_Click">
+                                            <Button.Background>
+                                                <SolidColorBrush Color="{Binding BackgroundColor}"/>
+                                            </Button.Background>
+                                        </Button>
+                                    </Border>
                                     <TextBox Text="{Binding BackgroundColor}" ToolTip="#AARRGGBB"/>
                                 </DockPanel>
                             </Grid>
diff --git a/SpineViewer/Views/ExporterDialogs/FrameSequenceExporterDialog.xaml b/SpineViewer/Views/ExporterDialogs/FrameSequenceExporterDialog.xaml
index 3097f38..2bfedd0 100644
--- a/SpineViewer/Views/ExporterDialogs/FrameSequenceExporterDialog.xaml
+++ b/SpineViewer/Views/ExporterDialogs/FrameSequenceExporterDialog.xaml
@@ -114,14 +114,15 @@
                                             <hc:ColorPicker Confirmed="ColorPicker_Confirmed" Canceled="ColorPicker_Canceled"/>
                                         </Popup>
                                     </Border>
-                                    <Button DockPanel.Dock="Right" 
-                                            Content="..." 
-                                            Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
-                                            Click="ButtonPickColor_Click">
-                                        <Button.Background>
-                                            <SolidColorBrush Color="{Binding BackgroundColor}"/>
-                                        </Button.Background>
-                                    </Button>
+                                    <Border DockPanel.Dock="Right" Background="White" CornerRadius="{DynamicResource DefaultCornerRadius}">
+                                        <Button Content="..." 
+                                                Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
+                                                Click="ButtonPickColor_Click">
+                                            <Button.Background>
+                                                <SolidColorBrush Color="{Binding BackgroundColor}"/>
+                                            </Button.Background>
+                                        </Button>
+                                    </Border>
                                     <TextBox Text="{Binding BackgroundColor}" ToolTip="#AARRGGBB"/>
                                 </DockPanel>
                             </Grid>
diff --git a/SpineViewer/Views/MainWindow.xaml b/SpineViewer/Views/MainWindow.xaml
index 65af3c1..1936bb0 100644
--- a/SpineViewer/Views/MainWindow.xaml
+++ b/SpineViewer/Views/MainWindow.xaml
@@ -956,8 +956,8 @@
                                             </Border>
                                             <Border DockPanel.Dock="Right" Background="White" CornerRadius="{DynamicResource DefaultCornerRadius}">
                                                 <Button Content="..."
-                                                    Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
-                                                    Click="ButtonPickColor_Click">
+                                                        Foreground="{Binding BackgroundColor, Converter={StaticResource Bg2FgCvter}}"
+                                                        Click="ButtonPickColor_Click">
                                                     <Button.Background>
                                                         <SolidColorBrush Color="{Binding BackgroundColor}"/>
                                                     </Button.Background>