diff --git a/config/themes.json b/config/themes.json
index 18f55b56..d3cc20ad 100644
--- a/config/themes.json
+++ b/config/themes.json
@@ -19,7 +19,7 @@
         "IconFontSize":     "14",
         "IconButtonSize":   "35",
         "SettingsIconFontSize":   "18",
-        "CloseIconFontSize":      "18",
+        "CloseIconFontSize":      "12",
         "MicroWinLogoSize": "10",
         "MicrowinCheckBoxMargin": "-10,5,0,0",
         "GroupBorderBackgroundColor":  "#232629",
diff --git a/xaml/inputXML.xaml b/xaml/inputXML.xaml
index db6894f4..5374f0c5 100644
--- a/xaml/inputXML.xaml
+++ b/xaml/inputXML.xaml
@@ -617,9 +617,22 @@
                                         <ControlTemplate TargetType="ContextMenu">
                                             <Border Background="{DynamicResource MainBackgroundColor}" BorderBrush="{DynamicResource BorderColor}" BorderThickness="1" CornerRadius="5" Padding="5">
                                                 <StackPanel>
-                                                    <MenuItem Command="Cut" Header="Cut"/>
-                                                    <MenuItem Command="Copy" Header="Copy"/>
-                                                    <MenuItem Command="Paste" Header="Paste"/>
+                                                    <MenuItem Command="Cut" Header="Cut">
+                                                    <MenuItem.Icon>
+                                                            <TextBlock Text="&#xE8C6;" FontSize="14" FontFamily="Segoe Fluent Icons"/>
+                                                        </MenuItem.Icon>
+                                                    </MenuItem>
+                                                    <MenuItem Command="Copy" Header="Copy">
+                                                        <MenuItem.Icon>
+                                                            <TextBlock Text="&#xE8C8;" FontSize="14" FontFamily="Segoe Fluent Icons"/>
+                                                        </MenuItem.Icon>
+                                                    </MenuItem>
+                                                    <MenuItem Command="Paste" Header="Paste">
+                                                        <MenuItem.Icon>
+                                                            <TextBlock Text="&#xE77F;" FontSize="14" FontFamily="Segoe Fluent Icons"/>
+                                                        </MenuItem.Icon>
+                                                    </MenuItem>
+
                                                 </StackPanel>
                                             </Border>
                                         </ControlTemplate>
@@ -874,7 +887,7 @@
                     Width="{DynamicResource IconButtonSize}" Height="{DynamicResource IconButtonSize}"
                     HorizontalAlignment="Right" VerticalAlignment="Top"
                     Margin="5,5,5,0"
-                    FontFamily="Segoe MDL2 Assets"
+                    FontFamily="Segoe Fluent Icons"
                     Content="&#xE713;"/>
                 <Popup Grid.Column="3" Name="SettingsPopup"
                     IsOpen="False"
@@ -901,13 +914,13 @@
 
             <Button
                 Grid.Column="4"
-                Content="&#xD7;" BorderThickness="0"
+                Content="&#xE8BB;" BorderThickness="0"
                 BorderBrush="Transparent"
                 Background="{DynamicResource MainBackgroundColor}"
                 Width="{DynamicResource IconButtonSize}" Height="{DynamicResource IconButtonSize}"
                 HorizontalAlignment="Right" VerticalAlignment="Top"
                 Margin="0,5,5,0"
-                FontFamily="{DynamicResource FontFamily}"
+                FontFamily="Segoe Fluent Icons"
                 Foreground="{DynamicResource MainForegroundColor}" FontSize="{DynamicResource CloseIconFontSize}" Name="WPFCloseButton" />
             </Grid>