diff --git a/XP.Camera/Calibration/Controls/CalibrationControl.xaml b/XP.Camera/Calibration/Controls/CalibrationControl.xaml
index a7bc653..3fdb67c 100644
--- a/XP.Camera/Calibration/Controls/CalibrationControl.xaml
+++ b/XP.Camera/Calibration/Controls/CalibrationControl.xaml
@@ -3,7 +3,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
              xmlns:cal="clr-namespace:XP.Camera.Calibration"
              xmlns:controls="clr-namespace:XP.Camera.Calibration.Controls"
              mc:Ignorable="d"
@@ -36,9 +35,6 @@
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 CornerRadius="3">
                             <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                                <ContentPresenter Content="{TemplateBinding Tag}"
-                                                  HorizontalAlignment="Center"
-                                                  Margin="0,4,0,4" />
                                 <TextBlock Text="{TemplateBinding Content}"
                                            FontSize="12"
                                            HorizontalAlignment="Center"
@@ -77,39 +73,19 @@
             <StackPanel Orientation="Horizontal">
                 <Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.CalibrationLoadImage}"
                         Command="{Binding LoadImageCommand}" FontFamily="Segoe UI"
-                        Style="{StaticResource ToolbarButtonStyle}">
-                    <Button.Tag>
-                        <iconPacks:PackIconMaterial Kind="ImageOutline" Width="24" Height="24" />
-                    </Button.Tag>
-                </Button>
+                        Style="{StaticResource ToolbarButtonStyle}" />
                 <Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.CalibrationLoadCsv}"
                         Command="{Binding LoadCsvCommand}" FontFamily="Segoe UI"
-                        Style="{StaticResource ToolbarButtonStyle}">
-                    <Button.Tag>
-                        <iconPacks:PackIconMaterial Kind="FileDelimited" Width="24" Height="24" />
-                    </Button.Tag>
-                </Button>
+                        Style="{StaticResource ToolbarButtonStyle}" />
                 <Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.CalibrationExecute}"
                         Command="{Binding CalibrateCommand}" FontFamily="Segoe UI"
-                        Style="{StaticResource ToolbarButtonStyle}">
-                    <Button.Tag>
-                        <iconPacks:PackIconMaterial Kind="Crosshairs" Width="24" Height="24" />
-                    </Button.Tag>
-                </Button>
+                        Style="{StaticResource ToolbarButtonStyle}" />
                 <Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.CalibrationSave}"
                         Command="{Binding SaveCalibrationCommand}" FontFamily="Segoe UI"
-                        Style="{StaticResource ToolbarButtonStyle}">
-                    <Button.Tag>
-                        <iconPacks:PackIconMaterial Kind="ContentSave" Width="24" Height="24" />
-                    </Button.Tag>
-                </Button>
+                        Style="{StaticResource ToolbarButtonStyle}" />
                 <Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.CalibrationLoad}"
                         Command="{Binding LoadCalibrationCommand}" FontFamily="Segoe UI"
-                        Style="{StaticResource ToolbarButtonStyle}">
-                    <Button.Tag>
-                        <iconPacks:PackIconMaterial Kind="FolderOpen" Width="24" Height="24" />
-                    </Button.Tag>
-                </Button>
+                        Style="{StaticResource ToolbarButtonStyle}" />
                 <CheckBox Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.CalibrationShowWorld}"
                           VerticalAlignment="Center" FontFamily="Segoe UI"
                           IsChecked="{Binding ShowWorldCoordinates}"
diff --git a/XP.Camera/Calibration/Controls/ChessboardCalibrationControl.xaml b/XP.Camera/Calibration/Controls/ChessboardCalibrationControl.xaml
index dca8b2d..3ad6160 100644
--- a/XP.Camera/Calibration/Controls/ChessboardCalibrationControl.xaml
+++ b/XP.Camera/Calibration/Controls/ChessboardCalibrationControl.xaml
@@ -3,7 +3,6 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-             xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
              xmlns:cal="clr-namespace:XP.Camera.Calibration"
              xmlns:controls="clr-namespace:XP.Camera.Calibration.Controls"
              mc:Ignorable="d"
@@ -37,9 +36,6 @@
                                 BorderThickness="{TemplateBinding BorderThickness}"
                                 CornerRadius="3">
                             <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-                                <ContentPresenter Content="{TemplateBinding Tag}"
-                                                  HorizontalAlignment="Center"
-                                                  Margin="0,4,0,4" />
                                 <TextBlock Text="{TemplateBinding Content}"
                                            FontSize="12" FontFamily="Segoe UI"
                                            HorizontalAlignment="Center"
@@ -76,29 +72,17 @@
                 BorderThickness="0,0,0,1" Padding="15,10">
             <StackPanel Orientation="Horizontal">
                 <Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.ChessboardAddImages}" Command="{Binding AddImagesCommand}"
-                        Style="{StaticResource ToolbarButtonStyle}">
-                    <Button.Tag><iconPacks:PackIconMaterial Kind="ImageMultiple" Width="24" Height="24" /></Button.Tag>
-                </Button>
+                        Style="{StaticResource ToolbarButtonStyle}" />
                 <Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.ChessboardClearImages}" Command="{Binding ClearImagesCommand}"
-                        Style="{StaticResource ToolbarButtonStyle}">
-                    <Button.Tag><iconPacks:PackIconMaterial Kind="DeleteSweep" Width="24" Height="24" /></Button.Tag>
-                </Button>
+                        Style="{StaticResource ToolbarButtonStyle}" />
                 <Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.ChessboardCalibrate}" Command="{Binding CalibrateCommand}"
-                        Style="{StaticResource ToolbarButtonStyle}">
-                    <Button.Tag><iconPacks:PackIconMaterial Kind="GridLarge" Width="24" Height="24" /></Button.Tag>
-                </Button>
+                        Style="{StaticResource ToolbarButtonStyle}" />
                 <Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.ChessboardSave}" Command="{Binding SaveCalibrationCommand}"
-                        Style="{StaticResource ToolbarButtonStyle}">
-                    <Button.Tag><iconPacks:PackIconMaterial Kind="ContentSave" Width="24" Height="24" /></Button.Tag>
-                </Button>
+                        Style="{StaticResource ToolbarButtonStyle}" />
                 <Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.ChessboardLoad}" Command="{Binding LoadCalibrationCommand}"
-                        Style="{StaticResource ToolbarButtonStyle}">
-                    <Button.Tag><iconPacks:PackIconMaterial Kind="FolderOpen" Width="24" Height="24" /></Button.Tag>
-                </Button>
+                        Style="{StaticResource ToolbarButtonStyle}" />
                 <Button Content="{Binding Source={StaticResource LocalizedStrings}, Path=Resources.ChessboardUndistort}" Command="{Binding UndistortImageCommand}"
-                        Style="{StaticResource ToolbarButtonStyle}">
-                    <Button.Tag><iconPacks:PackIconMaterial Kind="ImageEdit" Width="24" Height="24" /></Button.Tag>
-                </Button>
+                        Style="{StaticResource ToolbarButtonStyle}" />
             </StackPanel>
         </Border>