diff --git a/BallanceTasEditor/BallanceTasEditor/App.xaml b/BallanceTasEditor/BallanceTasEditor/App.xaml
index 2d2de7c..9ebaeb1 100644
--- a/BallanceTasEditor/BallanceTasEditor/App.xaml
+++ b/BallanceTasEditor/BallanceTasEditor/App.xaml
@@ -9,6 +9,7 @@
                 <ResourceDictionary Source="/Frontend/Styles/AccessoryIconControl.xaml"/>
                 <ResourceDictionary Source="/Frontend/Styles/GenericButton.xaml"/>
                 <ResourceDictionary Source="/Frontend/Styles/TextboxErrorTemplate.xaml"/>
+                <ResourceDictionary Source="/Frontend/Widgets/IconButton.xaml"/>
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/BallanceTasEditor/BallanceTasEditor/Frontend/Views/NewFileDialog.xaml b/BallanceTasEditor/BallanceTasEditor/Frontend/Views/NewFileDialog.xaml
index 10c7802..dd97003 100644
--- a/BallanceTasEditor/BallanceTasEditor/Frontend/Views/NewFileDialog.xaml
+++ b/BallanceTasEditor/BallanceTasEditor/Frontend/Views/NewFileDialog.xaml
@@ -61,10 +61,10 @@
         </Grid>
 
         <StackPanel Orientation="Horizontal" Grid.Row="2" HorizontalAlignment="Right" Margin="10">
-            <Button Content="OK" Margin="5" Style="{StaticResource OkButtonStyle}" IsDefault="True"
-                    Command="{Binding OkCommand}"/>
-            <Button Content="Cancel" Margin="5" Style="{StaticResource CancelButtonStyle}"
-                    Command="{Binding CancelCommand}"/>
+            <widget:IconButton Margin="5" Style="{StaticResource OkIconButtonStyle}" IsDefault="True"
+                               Command="{Binding OkCommand}"/>
+            <widget:IconButton Margin="5" Style="{StaticResource CancelIconButtonStyle}"
+                               Command="{Binding CancelCommand}"/>
         </StackPanel>
     </Grid>
 </Window>
diff --git a/BallanceTasEditor/BallanceTasEditor/Frontend/Widgets/IconButton.cs b/BallanceTasEditor/BallanceTasEditor/Frontend/Widgets/IconButton.cs
new file mode 100644
index 0000000..fc5aa2e
--- /dev/null
+++ b/BallanceTasEditor/BallanceTasEditor/Frontend/Widgets/IconButton.cs
@@ -0,0 +1,41 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Navigation;
+using System.Windows.Shapes;
+
+namespace BallanceTasEditor.Frontend.Widgets {
+    public class IconButton : Button {
+        static IconButton() {
+            DefaultStyleKeyProperty.OverrideMetadata(typeof(IconButton), new FrameworkPropertyMetadata(typeof(IconButton)));
+        }
+
+        public string ButtonText {
+            get { return (string)GetValue(ButtonTextProperty); }
+            set { SetValue(ButtonTextProperty, value); }
+        }
+
+        // Using a DependencyProperty as the backing store for ButtonText.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty ButtonTextProperty =
+            DependencyProperty.Register("ButtonText", typeof(string), typeof(IconButton));
+
+        public ImageSource ButtonIcon {
+            get { return (ImageSource)GetValue(ButtonIconProperty); }
+            set { SetValue(ButtonIconProperty, value); }
+        }
+
+        // Using a DependencyProperty as the backing store for ButtonIcon.  This enables animation, styling, binding, etc...
+        public static readonly DependencyProperty ButtonIconProperty =
+            DependencyProperty.Register("ButtonIcon", typeof(ImageSource), typeof(IconButton));
+
+    }
+}
diff --git a/BallanceTasEditor/BallanceTasEditor/Frontend/Widgets/IconButton.xaml b/BallanceTasEditor/BallanceTasEditor/Frontend/Widgets/IconButton.xaml
new file mode 100644
index 0000000..83b87f4
--- /dev/null
+++ b/BallanceTasEditor/BallanceTasEditor/Frontend/Widgets/IconButton.xaml
@@ -0,0 +1,43 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:widget="clr-namespace:BallanceTasEditor.Frontend.Widgets">
+
+    <Style x:Key="IconButtonStyle" TargetType="{x:Type widget:IconButton}" BasedOn="{StaticResource {x:Type Button}}">
+        <!--
+        YYC MARK:
+        I was forced to use ContentTemplate to implement this.
+        If I directly set Content, it will trigger weird image reuse issue,
+        which cause only one IconButton can be displayed correctly.
+        -->
+        <Setter Property="ContentTemplate">
+            <Setter.Value>
+                <DataTemplate>
+                    <StackPanel Orientation="Horizontal">
+                        <Image Source="{Binding ButtonIcon, RelativeSource={RelativeSource AncestorType=widget:IconButton}, Mode=OneWay}" 
+                               RenderOptions.BitmapScalingMode="HighQuality"
+                               Width="16" Height="16" VerticalAlignment="Center"/>
+                        <TextBlock Text="{Binding ButtonText, RelativeSource={RelativeSource AncestorType=widget:IconButton}, Mode=OneWay}" 
+                                   Margin="5,0,0,0" VerticalAlignment="Center"/>
+                    </StackPanel>
+                </DataTemplate>
+            </Setter.Value>
+        </Setter>
+    </Style>
+
+    <Style TargetType="{x:Type widget:IconButton}" BasedOn="{StaticResource IconButtonStyle}"/>
+
+    <Style x:Key="OkIconButtonStyle" TargetType="{x:Type widget:IconButton}" BasedOn="{StaticResource IconButtonStyle}">
+        <Setter Property="Padding" Value="5"/>
+        <Setter Property="MinWidth" Value="80"/>
+        <Setter Property="ButtonIcon" Value="/Frontend/Assets/Ok.ico"/>
+        <Setter Property="ButtonText" Value="OK"/>
+    </Style>
+
+    <Style x:Key="CancelIconButtonStyle" TargetType="{x:Type widget:IconButton}" BasedOn="{StaticResource IconButtonStyle}">
+        <Setter Property="Padding" Value="5"/>
+        <Setter Property="MinWidth" Value="80"/>
+        <Setter Property="ButtonIcon" Value="/Frontend/Assets/Cancel.ico"/>
+        <Setter Property="ButtonText" Value="Cancel"/>
+    </Style>
+
+</ResourceDictionary>
\ No newline at end of file