diff --git a/dvmconsole/Assets/alerttone2.png b/dvmconsole/Assets/alerttone2.png
deleted file mode 100644
index 1981162..0000000
Binary files a/dvmconsole/Assets/alerttone2.png and /dev/null differ
diff --git a/dvmconsole/Assets/config2.png b/dvmconsole/Assets/config2.png
deleted file mode 100644
index 8abd250..0000000
Binary files a/dvmconsole/Assets/config2.png and /dev/null differ
diff --git a/dvmconsole/Assets/DvmLogo.png b/dvmconsole/Assets/logo.png
similarity index 100%
rename from dvmconsole/Assets/DvmLogo.png
rename to dvmconsole/Assets/logo.png
diff --git a/dvmconsole/AudioSettingsWindow.xaml b/dvmconsole/AudioSettingsWindow.xaml
index 86a715d..90f93be 100644
--- a/dvmconsole/AudioSettingsWindow.xaml
+++ b/dvmconsole/AudioSettingsWindow.xaml
@@ -1,7 +1,7 @@
 <Window x:Class="dvmconsole.AudioSettingsWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-        Title="Audio Settings" Height="400" Width="450" Icon="/Assets/audio.png"
+        Title="Audio Settings" Height="400" Width="450" Icon="/dvmconsole;component/Assets/audio.png"
         WindowStartupLocation="CenterOwner">
     <Grid Margin="10">
         <Grid.RowDefinitions>
diff --git a/dvmconsole/CallHistoryWindow.xaml b/dvmconsole/CallHistoryWindow.xaml
index 09e46d5..abe2662 100644
--- a/dvmconsole/CallHistoryWindow.xaml
+++ b/dvmconsole/CallHistoryWindow.xaml
@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:dvmconsole"
-        mc:Ignorable="d" Icon="/Assets/history.png"
+        mc:Ignorable="d" Icon="/dvmconsole;component/Assets/history.png"
         Title="Call History" Height="450" Width="351" WindowStartupLocation="CenterOwner">
     <Grid>
         <DataGrid ItemsSource="{Binding CallHistory}" AutoGenerateColumns="False" IsReadOnly="True" Margin="10">
diff --git a/dvmconsole/Controls/AlertTone.xaml b/dvmconsole/Controls/AlertTone.xaml
index 3b683cb..dd8deef 100644
--- a/dvmconsole/Controls/AlertTone.xaml
+++ b/dvmconsole/Controls/AlertTone.xaml
@@ -24,7 +24,7 @@
                     <GradientStop Color="#FFE3E3E3" Offset="0.517"/>
                 </LinearGradientBrush>
             </Button.Background>
-            <Image Height="40" Width="63" Source="/Assets/page.png" Margin="0,-8,0,0"/>
+            <Image Height="40" Width="63" Source="/dvmconsole;component/Assets/page.png" Margin="0,-8,0,0"/>
         </Button>
         <TextBox HorizontalAlignment="Center" FontWeight="Bold" FontSize="10" TextWrapping="Wrap" Text="{Binding AlertFileName}" TextAlignment="Center" VerticalAlignment="Top" Width="100" Background="{x:Null}" BorderThickness="0,0,0,0" Height="24" Margin="0,4,0,0" Grid.RowSpan="2" Foreground="White"/>
     </Grid>
diff --git a/dvmconsole/Controls/ChannelBox.xaml b/dvmconsole/Controls/ChannelBox.xaml
index d594219..169cc01 100644
--- a/dvmconsole/Controls/ChannelBox.xaml
+++ b/dvmconsole/Controls/ChannelBox.xaml
@@ -86,7 +86,7 @@
                             <Setter Property="CornerRadius" Value="2"/>
                         </Style>
                     </Button.Resources>
-                    <Image Source="/Assets/pageselect.png" Width="39" Height="39" Margin="1.5,2,0,0"/>
+                    <Image Source="/dvmconsole;component/Assets/pageselect.png" Width="39" Height="39" Margin="1.5,2,0,0"/>
                 </Button>
                 <Button Width="40" Height="40" x:Name="ChannelMarkerBtn" Click="ChannelMarkerBtn_Click" BorderThickness="0,0,0,0" Margin="5,0,0,0"
                         ToolTip="Channel Marker">
@@ -95,7 +95,7 @@
                             <Setter Property="CornerRadius" Value="2"/>
                         </Style>
                     </Button.Resources>
-                    <Image Source="/Assets/channelmarker.png" Width="36" Height="40"/>
+                    <Image Source="/dvmconsole;component/Assets/channelmarker.png" Width="36" Height="40"/>
                 </Button>
             </StackPanel>
             <Button x:Name="PttButton" Click="PTTButton_Click" HorizontalAlignment="Left" Width="42" Margin="41,1,0,4" Grid.ColumnSpan="2" BorderThickness="0,0,0,0" BorderBrush="#FFC1C1C1" UseLayoutRounding="False" Grid.RowSpan="2" Background="#FFEEA400"
@@ -105,7 +105,7 @@
                         <Setter Property="CornerRadius" Value="2"/>
                     </Style>
                 </Button.Resources>
-                <Image Source="/Assets/instantptt.png" Width="39" Height="40" Stretch="Fill" Margin="0,0,0,1"/>
+                <Image Source="/dvmconsole;component/Assets/instantptt.png" Width="39" Height="40" Stretch="Fill" Margin="0,0,0,1"/>
             </Button>
         </Grid>
     </Border>
diff --git a/dvmconsole/DVMConsole.csproj b/dvmconsole/DVMConsole.csproj
index 8da7544..6111456 100644
--- a/dvmconsole/DVMConsole.csproj
+++ b/dvmconsole/DVMConsole.csproj
@@ -12,22 +12,28 @@
     <Copyright>Copyright (c) 2025 Caleb, K4PHP and DVMProject (https://github.com/dvmproject) Authors.</Copyright>
     <PlatformTarget>x86</PlatformTarget>
     <PackageLicenseExpression>AGPL-3.0-only</PackageLicenseExpression>
+    <ApplicationIcon>Assets\AppIcon.ico</ApplicationIcon>
+    <Title>Digital Voice Modem - Desktop Dispatch Console</Title>
+    <Authors>Caleb, K4PHP and DVMProject (https://github.com/dvmproject) Authors</Authors>
+    <Company>DVMProject</Company>
+    <Product>Digital Voice Modem - Desktop Dispatch Console</Product>
+    <PackageProjectUrl>https://github.com/DVMProject/dvmconsole</PackageProjectUrl>
+    <PackageIcon>AppIcon.png</PackageIcon>
+    <PackageReadmeFile>README.md</PackageReadmeFile>
+    <RepositoryUrl>https://github.com/DVMProject/dvmconsole</RepositoryUrl>
+    <RepositoryType>git</RepositoryType>
   </PropertyGroup>
 
   <ItemGroup>
     <None Remove="alerttone.png" />
     <None Remove="Assets\alerttone.png" />
-    <None Remove="Assets\alerttone2.png" />
     <None Remove="Assets\AppIcon.ico" />
-    <None Remove="Assets\AppIcon.png" />
     <None Remove="Assets\audio.png" />
     <None Remove="Assets\bg_main_hd.png" />
     <None Remove="Assets\channelmarker.png" />
     <None Remove="Assets\clearemerg.png" />
     <None Remove="Assets\config.png" />
-    <None Remove="Assets\config2.png" />
     <None Remove="Assets\connection.png" />
-    <None Remove="Assets\DvmLogo.png" />
     <None Remove="Assets\history.png" />
     <None Remove="Assets\instantptt.png" />
     <None Remove="Assets\key.png" />
@@ -44,39 +50,43 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="Assets\alerttone.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\alerttone2.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\AppIcon.ico">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\AppIcon.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\audio.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\bg_main_hd.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
+    <Resource Include="Assets\alerttone.png">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Assets\AppIcon.ico">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Assets\AppIcon.png">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Assets\audio.png">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Assets\bg_main_hd.png">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Resource>
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="Assets\config.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\history.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\key.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\select.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
+    <None Include="..\README.md">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup>
+    <Resource Include="Assets\config.png">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Assets\history.png">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Assets\key.png">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Assets\select.png">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Resource>
   </ItemGroup>
 
  
@@ -93,36 +103,37 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="Assets\channelmarker.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\clearemerg.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\config2.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\connection.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\DvmLogo.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\instantptt.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\page.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\pageselect.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Assets\pttselect.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
+    <Resource Include="Assets\channelmarker.png">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Assets\clearemerg.png">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Assets\connection.png">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Assets\logo.png">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Assets\instantptt.png">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Assets\page.png">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Assets\pageselect.png">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Resource>
+    <Resource Include="Assets\pttselect.png">
+      <CopyToOutputDirectory>Never</CopyToOutputDirectory>
+    </Resource>
   </ItemGroup>
 
   <ItemGroup>
+    <None Update="Assets\AppIcon.png">
+      <Pack>True</Pack>
+      <PackagePath>\</PackagePath>
+    </None>
     <None Update="Audio\alert1.wav">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
diff --git a/dvmconsole/DigitalPageWindow.xaml b/dvmconsole/DigitalPageWindow.xaml
index 2d0c5ed..3eba9a8 100644
--- a/dvmconsole/DigitalPageWindow.xaml
+++ b/dvmconsole/DigitalPageWindow.xaml
@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:dvmconsole"
-        mc:Ignorable="d" Icon="/Assets/page.png"
+        mc:Ignorable="d" Icon="/dvmconsole;component/Assets/page.png"
         Title="Page Subscriber" Height="141" Width="330" WindowStartupLocation="CenterOwner">
     <Grid>
         <Button Name="SendPageButton" HorizontalAlignment="Left" Margin="108,66,0,0" VerticalAlignment="Top" Click="SendPageButton_Click" Width="120" Height="24">
diff --git a/dvmconsole/KeyStatusWindow.xaml b/dvmconsole/KeyStatusWindow.xaml
index 4f5c689..dad79d6 100644
--- a/dvmconsole/KeyStatusWindow.xaml
+++ b/dvmconsole/KeyStatusWindow.xaml
@@ -3,7 +3,7 @@
         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"
-        mc:Ignorable="d" Icon="/Assets/key.png"
+        mc:Ignorable="d" Icon="/dvmconsole;component/Assets/key.png"
         Title="Key Status Window" Height="450" Width="800" WindowStartupLocation="CenterOwner">
     <Grid>
         <ListView x:Name="KeyStatusListView" ItemsSource="{Binding KeyStatusItems}" Margin="10">
diff --git a/dvmconsole/MainWindow.xaml b/dvmconsole/MainWindow.xaml
index d0b9701..89a4a79 100644
--- a/dvmconsole/MainWindow.xaml
+++ b/dvmconsole/MainWindow.xaml
@@ -2,7 +2,8 @@
         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="875" Background="#FFF2F2F2" Icon="/Assets/AppIcon.ico">
+        Title="Digital Voice Modem - Desktop Dispatch Console" Height="600" Width="875" Background="#FFF2F2F2" 
+        Icon="/dvmconsole;component/Assets/AppIcon.ico">
     <Grid Background="#FFF2F2F2">
         <Grid.ColumnDefinitions>
             <ColumnDefinition Width="497*"/>
@@ -56,13 +57,13 @@
         <ScrollViewer x:Name="canvasScrollViewer" VerticalAlignment="Stretch" HorizontalAlignment="Stretch" VerticalScrollBarVisibility="Auto" HorizontalScrollBarVisibility="Auto" Grid.Row="2" Grid.ColumnSpan="2">
             <Canvas x:Name="channelsCanvas" VerticalAlignment="Top">
                 <Canvas.Background>
-                    <ImageBrush x:Name="channelsCanvasBg" ImageSource="/Assets/bg_main_hd.png" Stretch="UniformToFill" />
+                    <ImageBrush x:Name="channelsCanvasBg" ImageSource="/dvmconsole;component/Assets/bg_main_hd.png" Stretch="UniformToFill" />
                 </Canvas.Background>
             </Canvas>
         </ScrollViewer>
 
         <!-- Application Banner -->
-        <Image Height="50" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Left" Source="/Assets/DvmLogo.png" Stretch="UniformToFill" Margin="5,0,0,0" RenderTransformOrigin="0.5,0.5" Width="224">
+        <Image Height="50" Grid.Row="1" VerticalAlignment="Center" HorizontalAlignment="Left" Source="/dvmconsole;component/Assets/logo.png" Stretch="UniformToFill" Margin="5,0,0,0" RenderTransformOrigin="0.5,0.5" Width="224">
             <Image.RenderTransform>
                 <TransformGroup>
                     <ScaleTransform/>
@@ -87,7 +88,7 @@
                     <GradientStop Color="#FFDBDBDB" Offset="0.517"/>
                 </LinearGradientBrush>
             </Button.Background>
-            <Image HorizontalAlignment="Left" Width="41" Source="/Assets/config2.png" IsHitTestVisible="False" RenderTransformOrigin="0.5,0.598" Height="46"/>
+            <Image HorizontalAlignment="Left" Width="41" Source="/dvmconsole;component/Assets/config.png" IsHitTestVisible="False" RenderTransformOrigin="0.5,0.598" Height="46"/>
         </Button>
 
         <!-- Global PTT -->
@@ -104,7 +105,7 @@
                     <GradientStop Color="#FFDBDBDB" Offset="0.517"/>
                 </LinearGradientBrush>
             </Button.Background>
-            <Image HorizontalAlignment="Center" Width="62" Source="/Assets/instantptt.png" IsHitTestVisible="False" Height="45" >
+            <Image HorizontalAlignment="Center" Width="62" Source="/dvmconsole;component/Assets/instantptt.png" IsHitTestVisible="False" Height="45" >
                 <Image.OpacityMask>
                     <LinearGradientBrush EndPoint="0.5,1" StartPoint="0.5,0">
                         <GradientStop Color="Black"/>
@@ -129,7 +130,7 @@
                 </LinearGradientBrush>
             </Button.Background>
             <StackPanel>
-                <Image HorizontalAlignment="Center" Width="37" Source="/Assets/alerttone2.png" IsHitTestVisible="False" Height="34"/>
+                <Image HorizontalAlignment="Center" Width="37" Source="/dvmconsole;component/Assets/alerttone.png" IsHitTestVisible="False" Height="34"/>
                 <TextBlock TextAlignment="Center">1</TextBlock>
             </StackPanel>
         </Button>
@@ -147,7 +148,7 @@
                 </LinearGradientBrush>
             </Button.Background>
             <StackPanel>
-                <Image HorizontalAlignment="Center" Width="37" Source="/Assets/alerttone2.png" IsHitTestVisible="False" Height="34"/>
+                <Image HorizontalAlignment="Center" Width="37" Source="/dvmconsole;component/Assets/alerttone.png" IsHitTestVisible="False" Height="34"/>
                 <TextBlock TextAlignment="Center">2</TextBlock>
             </StackPanel>
         </Button>
@@ -165,7 +166,7 @@
                 </LinearGradientBrush>
             </Button.Background>
             <StackPanel>
-                <Image HorizontalAlignment="Center" Width="37" Source="/Assets/alerttone2.png" IsHitTestVisible="False" Height="34"/>
+                <Image HorizontalAlignment="Center" Width="37" Source="/dvmconsole;component/Assets/alerttone.png" IsHitTestVisible="False" Height="34"/>
                 <TextBlock TextAlignment="Center">3</TextBlock>
             </StackPanel>
         </Button>
@@ -184,7 +185,7 @@
                     <GradientStop Color="#FFDBDBDB" Offset="0.517"/>
                 </LinearGradientBrush>
             </Button.Background>
-            <Image HorizontalAlignment="Left" Width="38" Source="/Assets/page.png" IsHitTestVisible="False" Height="46"/>
+            <Image HorizontalAlignment="Left" Width="38" Source="/dvmconsole;component/Assets/page.png" IsHitTestVisible="False" Height="46"/>
         </Button>
 
         <!-- Clear Emergency (disabled) -->
@@ -202,7 +203,7 @@
                     <GradientStop Color="#FFDBDBDB" Offset="0.517"/>
                 </LinearGradientBrush>
             </Button.Background>
-            <Image HorizontalAlignment="Left" Width="37" Source="/Assets/clearemerg.png" IsHitTestVisible="False" Height="46"/>
+            <Image HorizontalAlignment="Left" Width="37" Source="/dvmconsole;component/Assets/clearemerg.png" IsHitTestVisible="False" Height="46"/>
         </Button>
 
         <!-- Select/Unselect All -->
@@ -219,7 +220,7 @@
                     <GradientStop Color="#FFDBDBDB" Offset="0.517"/>
                 </LinearGradientBrush>
             </Button.Background>
-            <Image HorizontalAlignment="Left" Width="41" Source="/Assets/select.png" IsHitTestVisible="False" RenderTransformOrigin="0.5,0.598" Height="46"/>
+            <Image HorizontalAlignment="Left" Width="41" Source="/dvmconsole;component/Assets/select.png" IsHitTestVisible="False" RenderTransformOrigin="0.5,0.598" Height="46"/>
         </Button>
 
         <!-- Encryption Key Information -->
@@ -236,7 +237,7 @@
                     <GradientStop Color="#FFDBDBDB" Offset="0.517"/>
                 </LinearGradientBrush>
             </Button.Background>
-            <Image HorizontalAlignment="Left" Width="41" Source="/Assets/key.png" IsHitTestVisible="False" RenderTransformOrigin="0.5,0.598" Height="46"/>
+            <Image HorizontalAlignment="Left" Width="41" Source="/dvmconsole;component/Assets/key.png" IsHitTestVisible="False" RenderTransformOrigin="0.5,0.598" Height="46"/>
         </Button>
 
         <!-- Call History -->
@@ -253,7 +254,7 @@
                     <GradientStop Color="#FFDBDBDB" Offset="0.517"/>
                 </LinearGradientBrush>
             </Button.Background>
-            <Image HorizontalAlignment="Left" Width="41" Source="/Assets/history.png" IsHitTestVisible="False" RenderTransformOrigin="0.5,0.598" Height="46"/>
+            <Image HorizontalAlignment="Left" Width="41" Source="/dvmconsole;component/Assets/history.png" IsHitTestVisible="False" RenderTransformOrigin="0.5,0.598" Height="46"/>
         </Button>
 
         <!-- Audio Settings -->
@@ -270,7 +271,7 @@
                     <GradientStop Color="#FFDBDBDB" Offset="0.517"/>
                 </LinearGradientBrush>
             </Button.Background>
-            <Image HorizontalAlignment="Left" Width="42" Source="/Assets/audio.png" IsHitTestVisible="False" Height="46"/>
+            <Image HorizontalAlignment="Left" Width="42" Source="/dvmconsole;component/Assets/audio.png" IsHitTestVisible="False" Height="46"/>
         </Button>
     </Grid>
 </Window>
diff --git a/dvmconsole/QuickCallPage.xaml b/dvmconsole/QuickCallPage.xaml
index 88679af..16bdb3d 100644
--- a/dvmconsole/QuickCallPage.xaml
+++ b/dvmconsole/QuickCallPage.xaml
@@ -4,7 +4,7 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:dvmconsole"
-        mc:Ignorable="d" Icon="/Assets/page.png"
+        mc:Ignorable="d" Icon="/dvmconsole;component/Assets/page.png"
         Title="QuickCall II Page" Height="146" Width="330" WindowStartupLocation="CenterOwner">
     <Grid>
         <Button HorizontalAlignment="Left" Margin="111,66,0,0" Name="SendButton" VerticalAlignment="Top" Click="SendButton_Click" Width="120" Height="24">
diff --git a/dvmconsole/WidgetSelectionWindow.xaml b/dvmconsole/WidgetSelectionWindow.xaml
index 14174b3..9c6c92c 100644
--- a/dvmconsole/WidgetSelectionWindow.xaml
+++ b/dvmconsole/WidgetSelectionWindow.xaml
@@ -1,6 +1,6 @@
 <Window x:Class="dvmconsole.WidgetSelectionWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Icon="/dvmconsole;component/Assets/select.png"
         Title="Select Widgets" Height="200" Width="300" WindowStartupLocation="CenterOwner">
     <StackPanel Margin="20">
         <TextBlock Text="Select Widgets to Display:" FontWeight="Bold" Margin="0,0,0,10" />