diff --git a/wpf_ax_utility/MainWindow.xaml b/wpf_ax_utility/AppMainWindow.xaml
similarity index 59%
rename from wpf_ax_utility/MainWindow.xaml
rename to wpf_ax_utility/AppMainWindow.xaml
index 1c424d2..657f71d 100644
--- a/wpf_ax_utility/MainWindow.xaml
+++ b/wpf_ax_utility/AppMainWindow.xaml
@@ -1,9 +1,10 @@
-<Window x:Class="wpf_ax_utility.MainWindow"
+<Window x:Class="wpf_ax_utility.AppMainWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         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:converters="http://sharpvectors.codeplex.com/svgc/"
+        xmlns:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+        dx:ThemeManager.ThemeName="None"
         mc:Ignorable="d"
         MouseLeftButtonDown="MouseLeftDrag"
         Height="300" Width="400"
@@ -13,7 +14,7 @@
         AllowsTransparency="True"
         Background="Transparent"
         Title="PAL Ax Utility"
-        Icon="/axlogo.ico">
+        Icon="res/axlogo.ico">
 
     <Window.Resources>
         <Style TargetType="Button" x:Key="TabButton">
@@ -25,9 +26,6 @@
                 </Style>
             </Style.Resources>
         </Style>
-        <GeometryGroup x:Key="tashCan">
-            <PathGeometry Figures="M135.2 17.7C140.6 6.8 151.7 0 163.8 0H284.2c12.1 0 23.2 6.8 28.6 17.7L320 32h96c17.7 0 32 14.3 32 32s-14.3 32-32 32H32C14.3 96 0 81.7 0 64S14.3 32 32 32h96l7.2-14.3zM32 128H416V448c0 35.3-28.7 64-64 64H96c-35.3 0-64-28.7-64-64V128zm96 64c-8.8 0-16 7.2-16 16V432c0 8.8 7.2 16 16 16s16-7.2 16-16V208c0-8.8-7.2-16-16-16zm96 0c-8.8 0-16 7.2-16 16V432c0 8.8 7.2 16 16 16s16-7.2 16-16V208c0-8.8-7.2-16-16-16zm96 0c-8.8 0-16 7.2-16 16V432c0 8.8 7.2 16 16 16s16-7.2 16-16V208c0-8.8-7.2-16-16-16z"/>
-        </GeometryGroup>
     </Window.Resources>
 
     <Grid>
@@ -41,23 +39,31 @@
                 </Grid.RowDefinitions>
 
                 <DockPanel>
+                    
                     <Border Height="25" Width="25" CornerRadius="5" Margin="4,3,0,0">
                         <Border.Background>
-                            <ImageBrush Stretch="Fill" ImageSource="/axlogo.ico"/>
+                            <ImageBrush Stretch="Fill" ImageSource="res/axlogo.ico"/>
                         </Border.Background>
                     </Border>
-                    <TextBlock Margin="5,0,0,0" FontWeight="DemiBold" Text="PAL Ax Utility" VerticalAlignment="Center"/>
+                    
+                    <TextBlock Margin="5,2,0,0" FontWeight="DemiBold" Text="PAL Ax Utility" VerticalAlignment="Center"/>
+
                     <Button Style="{StaticResource TabButton}"
                             Click="CloseButton"
-                            Height="25" Width="25"
-                            FontSize="18"
+                            Height="25"
+                            Width="25"
+                            FontSize="15"
                             FontWeight="DemiBold"
                             Background="Transparent"
                             HorizontalAlignment="Right"
-                            BorderBrush="{x:Null}"
-                            Margin="0,3,3,0">
-                        <TextBlock Text="x" Margin="0,-5,0,0"/>
+                            VerticalAlignment="Center"
+                            Margin="0,3,3,0"
+                            BorderBrush="{x:Null}">
+                        <TextBlock Text="x"
+                            Height="25"
+                            Width="25" HorizontalAlignment="Center" VerticalAlignment="Center" />
                     </Button>
+
                 </DockPanel>
 
                 <GroupBox Margin="10,2,10,2"
@@ -66,6 +72,7 @@
                           BorderThickness="1"
                           Header="Ambienti"
                           Grid.Row="1">
+
                     <Grid>
                         <Grid.ColumnDefinitions>
                             <ColumnDefinition />
@@ -79,56 +86,60 @@
                         </Grid.RowDefinitions>
 
                         <Button Style="{StaticResource TabButton}"
-                                x:Name="LIVE"
-                                Click="ButtonClicked"
-                                Margin="5"
-                                Content="LIVE"
-                                FontSize="36"
-                                Background="LightGray"
-                                Grid.ColumnSpan="4" />
+                                    x:Name="LIVE"
+                                    Click="ButtonClicked"
+                                    Margin="5"
+                                    Content="LIVE"
+                                    FontSize="36"
+                                    Background="LightGray"
+                                    Grid.ColumnSpan="4" />
 
                         <Button Style="{StaticResource TabButton}"
-                                x:Name="LIVE02"
-                                Click="ButtonClicked"
-                                Margin="5"
-                                Content="LIVE 02"
-                                FontSize="16"
-                                FontWeight="DemiBold"
-                                Background="LightGray"
-                                Grid.Row="1"/>
+                                    x:Name="LIVE02"
+                                    Click="ButtonClicked"
+                                    Margin="5"
+                                    Content="LIVE 02"
+                                    FontSize="16"
+                                    FontWeight="DemiBold"
+                                    Background="LightGray"
+                                    Grid.Row="1"/>
+
                         <Button Style="{StaticResource TabButton}"
-                                x:Name="DEV"
-                                Click="ButtonClicked"
-                                Margin="5"
-                                Content="DEV"
-                                FontSize="16"
-                                FontWeight="DemiBold"
-                                Background="#00FF80"
-                                Grid.Row="1"
-                                Grid.Column="1"/>
+                                    x:Name="DEV"
+                                    Click="ButtonClicked"
+                                    Margin="5"
+                                    Content="DEV"
+                                    FontSize="16"
+                                    FontWeight="DemiBold"
+                                    Background="#00FF80"
+                                    Grid.Row="1"
+                                    Grid.Column="1"/>
+
                         <Button Style="{StaticResource TabButton}"
-                                x:Name="TEST"
-                                Click="ButtonClicked"
-                                Margin="5"
-                                Content="TEST"
-                                FontSize="16"
-                                FontWeight="DemiBold"
-                                Background="#8080FF"
-                                Grid.Row="1"
-                                Grid.Column="2"/>
+                                    x:Name="TEST"
+                                    Click="ButtonClicked"
+                                    Margin="5"
+                                    Content="TEST"
+                                    FontSize="16"
+                                    FontWeight="DemiBold"
+                                    Background="#8080FF"
+                                    Grid.Row="1"
+                                    Grid.Column="2"/>
+
                         <Button Style="{StaticResource TabButton}"
-                                x:Name="STAGING"
-                                Click="ButtonClicked"
-                                Margin="5"
-                                Content="STAGING"
-                                FontSize="16"
-                                FontWeight="DemiBold"
-                                Background="#FFFF00"
-                                Grid.Row="1"
-                                Grid.Column="3"/>
+                                    x:Name="STAGING"
+                                    Click="ButtonClicked"
+                                    Margin="5"
+                                    Content="STAGING"
+                                    FontSize="16"
+                                    FontWeight="DemiBold"
+                                    Background="#FFFF00"
+                                    Grid.Row="1"
+                                    Grid.Column="3"/>
 
                     </Grid>
                 </GroupBox>
+                
                 <GroupBox Margin="10,2,10,10"
                           VerticalAlignment="Stretch"
                           BorderBrush="LightGray"
@@ -149,7 +160,7 @@
                                 Background="LightGray"
                                 Grid.Column="0">
                                 <StackPanel Orientation="Horizontal">
-                                    <Path Margin="5,0,5,0" Height="15" Width="13.125" Stretch="Fill" Fill="Black" Stroke="Black" StrokeThickness="0.1" StrokeStartLineCap="Flat" StrokeEndLineCap="Round" Data="{StaticResource tashCan}" VerticalAlignment="Center"/>
+                                    <!--<Path Margin="5,0,5,0" Height="15" Width="13.125" Stretch="Fill" Fill="Black" Stroke="Black" StrokeThickness="0.1" StrokeStartLineCap="Flat" StrokeEndLineCap="Round" Data="{StaticResource tashCan}" VerticalAlignment="Center"/>-->
                                     <TextBlock>Elimina .AUC</TextBlock>
                                 </StackPanel>
                         </Button>
diff --git a/wpf_ax_utility/AppMainWindow.xaml.cs b/wpf_ax_utility/AppMainWindow.xaml.cs
new file mode 100644
index 0000000..3eb9752
--- /dev/null
+++ b/wpf_ax_utility/AppMainWindow.xaml.cs
@@ -0,0 +1,44 @@
+using System.Windows;
+using System.Windows.Input;
+
+namespace wpf_ax_utility
+{
+    public partial class AppMainWindow : Window
+    {
+        public AppMainWindow()
+        {
+            InitializeComponent();
+        }
+
+        private void MouseLeftDrag(object sender, MouseButtonEventArgs e)
+        {
+            DragMove();
+        }
+
+        private void CloseButton(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+
+        private void AucCleanerButton(object sender, RoutedEventArgs e)
+        {
+            Utility.AucCleaner();
+
+            const string message = "I file .auc sono stati cancellati!";
+            const string caption = "Informazioni";
+            MessageBox.Show(message, caption, MessageBoxButton.OK, MessageBoxImage.Information);
+        }
+
+        private void InfoButtonButton(object sender, RoutedEventArgs e)
+        {
+            const string message = "Durante il normale utilizzo del software Microsoft Dynamics Ax 2012, potrebbero generarsi dei conflitti nelle impostazioni utente, che bloccano l'apertura del programma.\r\n\r\nÈ possibile tentare di sbloccare la situazione eliminando i file AUC dalla cache locale dell'utente.";
+            const string caption = "Informazioni";
+            MessageBox.Show(message, caption, MessageBoxButton.OK, MessageBoxImage.Information);
+        }
+
+        private void ButtonClicked(object sender, RoutedEventArgs e)
+        {
+            Utility.AxEnvironmentSelection(sender, e);
+        }
+    }
+}
diff --git a/wpf_ax_utility/UserWindow.xaml b/wpf_ax_utility/AppUserWindow.xaml
similarity index 94%
rename from wpf_ax_utility/UserWindow.xaml
rename to wpf_ax_utility/AppUserWindow.xaml
index 874051f..0083ec4 100644
--- a/wpf_ax_utility/UserWindow.xaml
+++ b/wpf_ax_utility/AppUserWindow.xaml
@@ -1,8 +1,10 @@
-<Window x:Class="wpf_ax_utility.UserWindow"
+<Window x:Class="wpf_ax_utility.AppUserWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         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:dx="http://schemas.devexpress.com/winfx/2008/xaml/core"
+        dx:ThemeManager.ThemeName="None"
         mc:Ignorable="d"
         MouseLeftButtonDown="MouseLeftDrag"
         Height="260" Width="400"
@@ -12,7 +14,7 @@
         AllowsTransparency="True"
         Background="Transparent"
         Title="PAL Ax Utility"
-        Icon="/axlogo.ico">
+        Icon="res/axlogo.ico">
 
     <Window.Resources>
         <Style TargetType="Button" x:Key="TabButton">
@@ -41,7 +43,7 @@
                 <DockPanel>
                     <Border Height="25" Width="25" CornerRadius="5" Margin="4,3,0,0">
                         <Border.Background>
-                            <ImageBrush Stretch="Fill" ImageSource="/axlogo.ico"/>
+                            <ImageBrush Stretch="Fill" ImageSource="res/axlogo.ico"/>
                         </Border.Background>
                     </Border>
                     <TextBlock Margin="5,0,0,0" FontWeight="DemiBold" Text="PAL Ax Utility" VerticalAlignment="Center"/>
diff --git a/wpf_ax_utility/AppUserWindow.xaml.cs b/wpf_ax_utility/AppUserWindow.xaml.cs
new file mode 100644
index 0000000..7460138
--- /dev/null
+++ b/wpf_ax_utility/AppUserWindow.xaml.cs
@@ -0,0 +1,32 @@
+using Serilog;
+using System;
+using System.IO;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+
+namespace wpf_ax_utility
+{
+    public partial class AppUserWindow : Window
+    {
+        public AppUserWindow()
+        {
+            InitializeComponent();
+        }
+
+        private void MouseLeftDrag(object sender, MouseButtonEventArgs e)
+        {
+            DragMove();
+        }
+
+        private void CloseButton(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+
+        private void ButtonClicked(object sender, RoutedEventArgs e)
+        {
+            Utility.AxEnvironmentSelection(sender, e);
+        }
+    }
+}
diff --git a/wpf_ax_utility/MainWindow.xaml.cs b/wpf_ax_utility/MainWindow.xaml.cs
deleted file mode 100644
index 0d029a2..0000000
--- a/wpf_ax_utility/MainWindow.xaml.cs
+++ /dev/null
@@ -1,86 +0,0 @@
-using Serilog;
-using System;
-using System.IO;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-
-namespace wpf_ax_utility
-{
-    public partial class MainWindow : Window
-    {
-        public MainWindow()
-        {
-            InitializeComponent();
-        }
-
-        private void MouseLeftDrag(object sender, MouseButtonEventArgs e)
-        {
-            DragMove();
-        }
-
-        private void CloseButton(object sender, RoutedEventArgs e)
-        {
-            Close();
-        }
-
-        private void AucCleanerButton(object sender, RoutedEventArgs e)
-        {
-            Utility.AucCleaner();
-
-            const string message = "I file .auc sono stati cancellati!";
-            const string caption = "Informazioni";
-            MessageBox.Show(message, caption, MessageBoxButton.OK, MessageBoxImage.Information);
-        }
-
-        private void InfoButtonButton(object sender, RoutedEventArgs e)
-        {
-            const string message = "Durante il normale utilizzo del software Microsoft Dynamics Ax 2012, potrebbero generarsi dei conflitti nelle impostazioni utente, che bloccano l'apertura del programma.\r\n\r\nÈ possibile tentare di sbloccare la situazione eliminando i file AUC dalla cache locale dell'utente.";
-            const string caption = "Informazioni";
-            MessageBox.Show(message, caption, MessageBoxButton.OK, MessageBoxImage.Information);
-        }
-
-        private void ButtonClicked(object sender, RoutedEventArgs e)
-        {
-            Utility.AucCleaner();
-
-            string AxcFilePath = "";
-            
-            switch (((Button)sender).Name)
-            {
-                case "LIVE":
-                    AxcFilePath = Properties.Resources.network_axc_path + Properties.Resources.LIVE_axc_filename;
-                    if(!File.Exists(AxcFilePath))
-                        AxcFilePath = Properties.Resources.local_axc_path + Properties.Resources.LIVE_axc_filename;
-                    break;
-                case "LIVE02":
-                    AxcFilePath = Properties.Resources.network_axc_path + Properties.Resources.LIVE02_axc_filename;
-                    if (!File.Exists(AxcFilePath))
-                        AxcFilePath = Properties.Resources.local_axc_path + Properties.Resources.LIVE02_axc_filename;
-                    break;
-                case "DEV":
-                    AxcFilePath = Properties.Resources.network_axc_path + Properties.Resources.DEV_axc_filename;
-                    if (!File.Exists(AxcFilePath))
-                        AxcFilePath = Properties.Resources.local_axc_path + Properties.Resources.DEV_axc_filename;
-                    break;
-                case "TEST":
-                    AxcFilePath = Properties.Resources.network_axc_path + Properties.Resources.TEST_axc_filename;
-                    if (!File.Exists(AxcFilePath))
-                        AxcFilePath = Properties.Resources.local_axc_path + Properties.Resources.TEST_axc_filename;
-                    break;
-                case "STAGING":
-                    AxcFilePath = Properties.Resources.network_axc_path + Properties.Resources.STAGING_axc_filename;
-                    if (!File.Exists(AxcFilePath))
-                        AxcFilePath = Properties.Resources.local_axc_path + Properties.Resources.STAGING_axc_filename;
-                    break;
-            }
-
-
-            var AxArgs = @"-regConfig=" + AxcFilePath;
-            
-            Utility.AxExecution(AxArgs);
-
-            Log.Logger.Information("Running AX client with this parameter: " + AxArgs);
-        }
-    }
-}
diff --git a/wpf_ax_utility/UserWindow.xaml.cs b/wpf_ax_utility/UserWindow.xaml.cs
deleted file mode 100644
index 213447d..0000000
--- a/wpf_ax_utility/UserWindow.xaml.cs
+++ /dev/null
@@ -1,56 +0,0 @@
-using Serilog;
-using System;
-using System.IO;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Input;
-
-namespace wpf_ax_utility
-{
-    public partial class UserWindow : Window
-    {
-        public UserWindow()
-        {
-            InitializeComponent();
-        }
-
-        private void MouseLeftDrag(object sender, MouseButtonEventArgs e)
-        {
-            DragMove();
-        }
-
-        private void CloseButton(object sender, RoutedEventArgs e)
-        {
-            Close();
-        }
-
-        private void ButtonClicked(object sender, RoutedEventArgs e)
-        {
-            Utility.AucCleaner();
-
-            string AxcFilePath = "";
-
-            switch (((Button)sender).Name)
-            {
-                case "LIVE":
-                    AxcFilePath = Properties.Resources.network_axc_path + Properties.Resources.LIVE_axc_filename;
-                    if (!File.Exists(AxcFilePath))
-                        AxcFilePath = Properties.Resources.local_axc_path + Properties.Resources.LIVE_axc_filename;
-                    break;
-                case "TEST":
-                    AxcFilePath = Properties.Resources.network_axc_path + Properties.Resources.TEST_axc_filename;
-                    if (!File.Exists(AxcFilePath))
-                        AxcFilePath = Properties.Resources.local_axc_path + Properties.Resources.TEST_axc_filename;
-                    break; ;
-            }
-
-            var AxArgs = @"-regConfig=" + AxcFilePath;
-
-            Utility.AxExecution(AxArgs);
-
-            Log.Logger.Information("Running AX client with this parameter: " + AxArgs);
-        }
-
-        
-    }
-}
diff --git a/wpf_ax_utility/Utility.cs b/wpf_ax_utility/Utility.cs
index 38151bf..9a79359 100644
--- a/wpf_ax_utility/Utility.cs
+++ b/wpf_ax_utility/Utility.cs
@@ -6,6 +6,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Controls;
 
 namespace wpf_ax_utility
 {
@@ -14,6 +15,7 @@ namespace wpf_ax_utility
         Informational,
         Error
     }
+
     public static class Utility
     {
         public static void AxExecution(string AxArgs)
@@ -67,6 +69,49 @@ namespace wpf_ax_utility
             }
         }
 
+        public static void AxEnvironmentSelection(object sender, RoutedEventArgs e)
+        {
+            Utility.AucCleaner();
+
+            string AxcFilePath = "";
+
+            switch (((Button)sender).Name)
+            {
+                case "LIVE":
+                    AxcFilePath = Properties.Resources.network_axc_path + Properties.Resources.LIVE_axc_filename;
+                    if (!File.Exists(AxcFilePath))
+                        AxcFilePath = Properties.Resources.local_axc_path + Properties.Resources.LIVE_axc_filename;
+                    break;
+                case "LIVE02":
+                    AxcFilePath = Properties.Resources.network_axc_path + Properties.Resources.LIVE02_axc_filename;
+                    if (!File.Exists(AxcFilePath))
+                        AxcFilePath = Properties.Resources.local_axc_path + Properties.Resources.LIVE02_axc_filename;
+                    break;
+                case "DEV":
+                    AxcFilePath = Properties.Resources.network_axc_path + Properties.Resources.DEV_axc_filename;
+                    if (!File.Exists(AxcFilePath))
+                        AxcFilePath = Properties.Resources.local_axc_path + Properties.Resources.DEV_axc_filename;
+                    break;
+                case "TEST":
+                    AxcFilePath = Properties.Resources.network_axc_path + Properties.Resources.TEST_axc_filename;
+                    if (!File.Exists(AxcFilePath))
+                        AxcFilePath = Properties.Resources.local_axc_path + Properties.Resources.TEST_axc_filename;
+                    break;
+                case "STAGING":
+                    AxcFilePath = Properties.Resources.network_axc_path + Properties.Resources.STAGING_axc_filename;
+                    if (!File.Exists(AxcFilePath))
+                        AxcFilePath = Properties.Resources.local_axc_path + Properties.Resources.STAGING_axc_filename;
+                    break;
+            }
+
+
+            var AxArgs = @"-regConfig=" + AxcFilePath;
+
+            Utility.AxExecution(AxArgs);
+
+            Log.Logger.Information("Running AX client with this parameter: " + AxArgs);
+        }
+
         public static void WriteLogMessage(string message, LogMessageSeverity Severity = LogMessageSeverity.Informational, Exception exc = null)
         {
             try
diff --git a/wpf_ax_utility/axc/PAL_DEVELOP_USR.axc b/wpf_ax_utility/res/axc/PAL_DEVELOP_USR.axc
similarity index 100%
rename from wpf_ax_utility/axc/PAL_DEVELOP_USR.axc
rename to wpf_ax_utility/res/axc/PAL_DEVELOP_USR.axc
diff --git a/wpf_ax_utility/axc/PAL_LIVE_02_USR.axc b/wpf_ax_utility/res/axc/PAL_LIVE_02_USR.axc
similarity index 100%
rename from wpf_ax_utility/axc/PAL_LIVE_02_USR.axc
rename to wpf_ax_utility/res/axc/PAL_LIVE_02_USR.axc
diff --git a/wpf_ax_utility/axc/PAL_LIVE_USR.axc b/wpf_ax_utility/res/axc/PAL_LIVE_USR.axc
similarity index 100%
rename from wpf_ax_utility/axc/PAL_LIVE_USR.axc
rename to wpf_ax_utility/res/axc/PAL_LIVE_USR.axc
diff --git a/wpf_ax_utility/axc/PAL_STAGING_USR.axc b/wpf_ax_utility/res/axc/PAL_STAGING_USR.axc
similarity index 100%
rename from wpf_ax_utility/axc/PAL_STAGING_USR.axc
rename to wpf_ax_utility/res/axc/PAL_STAGING_USR.axc
diff --git a/wpf_ax_utility/axc/PAL_TEST_USR.axc b/wpf_ax_utility/res/axc/PAL_TEST_USR.axc
similarity index 100%
rename from wpf_ax_utility/axc/PAL_TEST_USR.axc
rename to wpf_ax_utility/res/axc/PAL_TEST_USR.axc
diff --git a/wpf_ax_utility/axlogo.ico b/wpf_ax_utility/res/axlogo.ico
similarity index 100%
rename from wpf_ax_utility/axlogo.ico
rename to wpf_ax_utility/res/axlogo.ico
diff --git a/wpf_ax_utility/res/pallogo.png b/wpf_ax_utility/res/pallogo.png
new file mode 100644
index 0000000..a1ad16b
Binary files /dev/null and b/wpf_ax_utility/res/pallogo.png differ
diff --git a/wpf_ax_utility/wpf_ax_utility.csproj b/wpf_ax_utility/wpf_ax_utility.csproj
index a03d1ac..ea9e5ca 100644
--- a/wpf_ax_utility/wpf_ax_utility.csproj
+++ b/wpf_ax_utility/wpf_ax_utility.csproj
@@ -5,36 +5,37 @@
     <TargetFramework>net6.0-windows</TargetFramework>
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
-    <ApplicationIcon>axlogo.ico</ApplicationIcon>
+    <ApplicationIcon>res\axlogo.ico</ApplicationIcon>
   </PropertyGroup>
 
   <ItemGroup>
     <None Remove="axlogo.ico" />
     <None Remove="axlogo.png" />
     <None Remove="rdrect1197.png" />
+    <None Remove="res\pallogo.png" />
   </ItemGroup>
 
   <ItemGroup>
-    <Content Include="axlogo.ico">
+    <Content Include="res\axlogo.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+    <Content Include="res\pallogo.png">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
 
   <ItemGroup>
+    <PackageReference Include="DevExpress.Wpf.Core" Version="22.2.4" />
     <PackageReference Include="Serilog" Version="2.12.0" />
     <PackageReference Include="Serilog.Sinks.Graylog" Version="2.3.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <Resource Include="axlogo.ico">
+    <Resource Include="res\axlogo.ico">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Resource>
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="axc\" />
-  </ItemGroup>
-
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
@@ -51,19 +52,19 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Update="axc\PAL_DEVELOP_USR.axc">
+    <None Update="res\axc\PAL_DEVELOP_USR.axc">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="axc\PAL_LIVE_02_USR.axc">
+    <None Update="res\axc\PAL_LIVE_02_USR.axc">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="axc\PAL_LIVE_USR.axc">
+    <None Update="res\axc\PAL_LIVE_USR.axc">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="axc\PAL_STAGING_USR.axc">
+    <None Update="res\axc\PAL_STAGING_USR.axc">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Update="axc\PAL_TEST_USR.axc">
+    <None Update="res\axc\PAL_TEST_USR.axc">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>