diff --git a/wpf_ax_utility/MainWindow.xaml b/wpf_ax_utility/MainWindow.xaml
index 07dc307..e0ca0e0 100644
--- a/wpf_ax_utility/MainWindow.xaml
+++ b/wpf_ax_utility/MainWindow.xaml
@@ -4,11 +4,15 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         mc:Ignorable="d"
+        MouseLeftButtonDown="MouseLeftDrag"
         Height="260" Width="400"
         ResizeMode="NoResize"
+        WindowStyle="None"
         WindowStartupLocation="CenterScreen"
+        AllowsTransparency="True"
+        Background="Transparent"
         Title="PAL Ax Utility"
-        Icon="/axlogo.png">
+        Icon="/axlogo.ico">
 
     <Window.Resources>
         <Style TargetType="Button" x:Key="TabButton">
@@ -21,52 +25,76 @@
             </Style.Resources>
         </Style>
     </Window.Resources>
+
     <Grid>
-        <GroupBox Margin="15,10,15,10"
-                  VerticalAlignment="Top"
-                  BorderBrush="LightGray"
-                  BorderThickness="1"
-                  Header="Ambienti">
-            <StackPanel Name="LayoutRoot"
-                        VerticalAlignment="Center"
-                        Margin="5,5,5,5">
-                <Button Style="{StaticResource TabButton}"
-                        x:Name="LIVE"
-                        Click="ButtonClicked"
-                        Height="115" Width="320"
-                        Content="LIVE"
-                        FontSize="36"/>
-                <DockPanel HorizontalAlignment="Center"
-                           Margin="0,10,0,0">
+        <Border BorderBrush="#0082C4" BorderThickness="1.5" CornerRadius="10" Background="White">
+            <StackPanel>
+                <DockPanel>
+                    <Border Height="25" Width="25" CornerRadius="5" Margin="2,0,0,0">
+                        <Border.Background>
+                            <ImageBrush Stretch="Fill" ImageSource="/axlogo.ico"/>
+                        </Border.Background>
+                    </Border>
+                    <TextBlock Margin="5,0,0,0" FontWeight="DemiBold" Text="PAL Ax Utility" VerticalAlignment="Center"/>
                     <Button Style="{StaticResource TabButton}"
-                            x:Name="DEV"
-                            Click="ButtonClicked"
-                            Height="45" Width="100"
-                            Margin="0,0,5,0"
-                            Content="DEV"
+                            Click="CloseButton"
+                            Height="25" Width="25"
                             FontSize="18"
                             FontWeight="DemiBold"
-                            Background="#00FF80"/>
-                    <Button Style="{StaticResource TabButton}"
-                            x:Name="TEST"
-                            Click="ButtonClicked"
-                            Height="45" Width="100"
-                            Margin="5,0,5,0"
-                            Content="TEST"
-                            FontSize="18"
-                            FontWeight="DemiBold"
-                            Background="#8080FF"/>
-                    <Button Style="{StaticResource TabButton}"
-                            x:Name="STAGING"
-                            Click="ButtonClicked"
-                            Height="45" Width="100"
-                            Margin="5,0,0,0"
-                            Content="STAGING"
-                            FontSize="18"
-                            FontWeight="DemiBold"
-                            Background="#FFFF00"/>
+                            Background="Transparent"
+                            HorizontalAlignment="Right"
+                            BorderBrush="{x:Null}"
+                            Margin="0,3,3,0">
+                        <TextBlock Text="x" Margin="0,-5,0,0"/>
+                    </Button>
                 </DockPanel>
+                <GroupBox Margin="15,5,15,10"
+                          VerticalAlignment="Center"
+                          BorderBrush="LightGray"
+                          BorderThickness="1"
+                          Header="Ambienti">
+                    <StackPanel Name="LayoutRoot"
+                                VerticalAlignment="Center"
+                                Margin="5,5,5,5">
+                        <Button Style="{StaticResource TabButton}"
+                                x:Name="LIVE"
+                                Click="ButtonClicked"
+                                Height="115" Width="320"
+                                Content="LIVE"
+                                FontSize="36"/>
+                        <DockPanel HorizontalAlignment="Center"
+                                   Margin="0,10,0,0">
+                            <Button Style="{StaticResource TabButton}"
+                                    x:Name="DEV"
+                                    Click="ButtonClicked"
+                                    Height="45" Width="100"
+                                    Margin="0,0,5,0"
+                                    Content="DEV"
+                                    FontSize="18"
+                                    FontWeight="DemiBold"
+                                    Background="#00FF80"/>
+                            <Button Style="{StaticResource TabButton}"
+                                    x:Name="TEST"
+                                    Click="ButtonClicked"
+                                    Height="45" Width="100"
+                                    Margin="5,0,5,0"
+                                    Content="TEST"
+                                    FontSize="18"
+                                    FontWeight="DemiBold"
+                                    Background="#8080FF"/>
+                            <Button Style="{StaticResource TabButton}"
+                                    x:Name="STAGING"
+                                    Click="ButtonClicked"
+                                    Height="45" Width="100"
+                                    Margin="5,0,0,0"
+                                    Content="STAGING"
+                                    FontSize="18"
+                                    FontWeight="DemiBold"
+                                    Background="#FFFF00"/>
+                        </DockPanel>
+                    </StackPanel>
+                </GroupBox>
             </StackPanel>
-        </GroupBox>
+        </Border>
     </Grid>
 </Window>
diff --git a/wpf_ax_utility/MainWindow.xaml.cs b/wpf_ax_utility/MainWindow.xaml.cs
index a12b1ef..59111fa 100644
--- a/wpf_ax_utility/MainWindow.xaml.cs
+++ b/wpf_ax_utility/MainWindow.xaml.cs
@@ -2,6 +2,7 @@
 using System.IO;
 using System.Windows;
 using System.Windows.Controls;
+using System.Windows.Input;
 
 namespace wpf_ax_utility
 {
@@ -12,30 +13,40 @@ namespace wpf_ax_utility
             InitializeComponent();
         }
 
+        private void MouseLeftDrag(object sender, MouseButtonEventArgs e)
+        {
+            DragMove();
+        }
+
+        private void CloseButton(object sender, RoutedEventArgs e)
+        {
+            Close();
+        }
+
         private void ButtonClicked(object sender, RoutedEventArgs e)
         {
             AucCleaner();
 
             string AxClient = @"C:\Program Files (x86)\Microsoft Dynamics AX\60\Client\Bin\Ax32.exe";
-            string AxArguments = string.Empty;
+            string AxArgs = string.Empty;
 
             switch (((Button)sender).Name)
             {
                 case "LIVE":
-                    AxArguments = @"-regConfig=L:\Link\PAL_LIVE_02_USR.axc";
+                    AxArgs = @"-regConfig=L:\Link\PAL_LIVE_02_USR.axc";
                     break;
                 case "DEV":
-                    AxArguments = @"-regConfig=L:\Link\PAL_DEVELOP_USR.axc";
+                    AxArgs = @"-regConfig=L:\Link\PAL_DEVELOP_USR.axc";
                     break ;
                 case "TEST":
-                    AxArguments = @"-regConfig=L:\Link\PAL_TEST_USR.axc";
+                    AxArgs = @"-regConfig=L:\Link\PAL_TEST_USR.axc";
                     break;
                 case "STAGING":
-                    AxArguments = @"-regConfig=L:\Link\PAL_STAGING_USR.axc";
+                    AxArgs = @"-regConfig=L:\Link\PAL_STAGING_USR.axc";
                     break; ;
             }
 
-            AxExecution(AxClient, AxArguments);
+            AxExecution(AxClient, AxArgs);
         }
 
         public static void AxExecution(string AxClient, string AxArgs)
diff --git a/wpf_ax_utility/axlogo.ico b/wpf_ax_utility/axlogo.ico
new file mode 100644
index 0000000..00ccdb2
Binary files /dev/null and b/wpf_ax_utility/axlogo.ico differ
diff --git a/wpf_ax_utility/axlogo.png b/wpf_ax_utility/axlogo.png
deleted file mode 100644
index 861f302..0000000
Binary files a/wpf_ax_utility/axlogo.png and /dev/null differ
diff --git a/wpf_ax_utility/pallogo.png b/wpf_ax_utility/pallogo.png
deleted file mode 100644
index e4fd3e9..0000000
Binary files a/wpf_ax_utility/pallogo.png and /dev/null differ
diff --git a/wpf_ax_utility/wpf_ax_utility.csproj b/wpf_ax_utility/wpf_ax_utility.csproj
index 4844db5..224d930 100644
--- a/wpf_ax_utility/wpf_ax_utility.csproj
+++ b/wpf_ax_utility/wpf_ax_utility.csproj
@@ -8,12 +8,15 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <None Remove="axlogo.ico" />
     <None Remove="axlogo.png" />
     <None Remove="rdrect1197.png" />
   </ItemGroup>
 
   <ItemGroup>
-    <Resource Include="axlogo.png" />
+    <Resource Include="axlogo.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Resource>
   </ItemGroup>
 
 </Project>