diff --git a/DVMConsole/MainWindow.xaml b/DVMConsole/MainWindow.xaml
index 4a0daaf..b49b7d3 100644
--- a/DVMConsole/MainWindow.xaml
+++ b/DVMConsole/MainWindow.xaml
@@ -2,7 +2,7 @@
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:local="clr-namespace:dvmconsole.Controls"
-        Title="Digital Voice Modem - Desktop Dispatch Console" Height="600" Width="1000" Background="#FFF2F2F2">
+        Title="Digital Voice Modem - Desktop Dispatch Console" Height="600" Width="1000" Background="#FFF2F2F2" Icon="/Assets/AppIcon.ico">
     <Grid Background="#FFF2F2F2">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="497*"/>
@@ -26,6 +26,8 @@
         <Menu VerticalAlignment="Center" Height="25" Background="White" Grid.ColumnSpan="2">
             <MenuItem Header="File">
                 <MenuItem Header="_Open Codeplug" Click="OpenCodeplug_Click"/>
+                <Separator />
+                <MenuItem Header="_Exit" Click="Exit_Click" />
             </MenuItem>
             <MenuItem Header="Edit">
                 <MenuItem Header="_Audio Settings" Click="AudioSettings_Click" />
diff --git a/DVMConsole/MainWindow.xaml.cs b/DVMConsole/MainWindow.xaml.cs
index 87189ba..bb2a1d7 100644
--- a/DVMConsole/MainWindow.xaml.cs
+++ b/DVMConsole/MainWindow.xaml.cs
@@ -1608,7 +1608,7 @@ namespace dvmconsole
                     {
                         channel.IsReceiving = true;
                         slot.RxStart = pktTime;
-                        Console.WriteLine($"({system.Name}) P25D: Traffic *CALL START     * PEER {e.PeerId} SRC_ID {e.SrcId} TGID {e.DstId} [STREAM ID {e.StreamId}]");
+                        Trace.WriteLine($"({system.Name}) P25D: Traffic *CALL START     * PEER {e.PeerId} SRC_ID {e.SrcId} TGID {e.DstId} [STREAM ID {e.StreamId}]");
 
                         FneUtils.Memset(channel.mi, 0x00, P25Defines.P25_MI_LENGTH);
 
@@ -1639,7 +1639,7 @@ namespace dvmconsole
                     {
                         channel.IsReceiving = false;
                         TimeSpan callDuration = pktTime - slot.RxStart;
-                        Console.WriteLine($"({system.Name}) P25D: Traffic *CALL END       * PEER {e.PeerId} SRC_ID {e.SrcId} TGID {e.DstId} DUR {callDuration} [STREAM ID {e.StreamId}]");
+                        Trace.WriteLine($"({system.Name}) P25D: Traffic *CALL END       * PEER {e.PeerId} SRC_ID {e.SrcId} TGID {e.DstId} DUR {callDuration} [STREAM ID {e.StreamId}]");
                         channel.Background = ChannelBox.SELECTED_COLOR;
                         callHistoryWindow.ChannelUnkeyed(cpgChannel.Name, (int)e.SrcId);
                         return;
@@ -1796,5 +1796,15 @@ namespace dvmconsole
         {
             callHistoryWindow.Show();
         }
+
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void Exit_Click(object sender, RoutedEventArgs e)
+        {
+            Application.Current.Shutdown();
+        }
     } // public partial class MainWindow : Window
 } // namespace dvmconsole
diff --git a/dvmconsole/Assets/AppIcon.ico b/dvmconsole/Assets/AppIcon.ico
new file mode 100644
index 0000000..e672c02
Binary files /dev/null and b/dvmconsole/Assets/AppIcon.ico differ
diff --git a/dvmconsole/Assets/AppIcon.png b/dvmconsole/Assets/AppIcon.png
new file mode 100644
index 0000000..4dc93e7
Binary files /dev/null and b/dvmconsole/Assets/AppIcon.png differ