diff --git a/.gitignore b/.gitignore
index 9491a2f..a662b69 100644
--- a/.gitignore
+++ b/.gitignore
@@ -184,7 +184,7 @@ publish/
 *.azurePubxml
 # Note: Comment the next line if you want to checkin your web deploy settings,
 # but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
+#*.pubxml
 *.publishproj
 
 # Microsoft Azure Web App publish settings. Comment the next line if you want to
diff --git a/MultiTerm.Protocols/MultiTerm.Protocols.csproj b/MultiTerm.Protocols/MultiTerm.Protocols.csproj
index 2a81e61..0d16cdc 100644
--- a/MultiTerm.Protocols/MultiTerm.Protocols.csproj
+++ b/MultiTerm.Protocols/MultiTerm.Protocols.csproj
@@ -13,12 +13,12 @@
 
   <ItemGroup>
     <EmbeddedResource Include="UsbHid\hidapi.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  <!-- directly to output folder, do not create subfolder UsbHid -->
 	  <TargetPath>%(Filename)%(Extension)</TargetPath>
 	</EmbeddedResource>
     <EmbeddedResource Include="UsbHid\hidapi.lib">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <!-- directly to output folder, do not create subfolder UsbHid -->
 	  <TargetPath>%(Filename)%(Extension)</TargetPath>
 	</EmbeddedResource>
diff --git a/MultiTerm.Wpf/Assets/console.ico b/MultiTerm.Wpf/Assets/console.ico
new file mode 100644
index 0000000..e3722d9
Binary files /dev/null and b/MultiTerm.Wpf/Assets/console.ico differ
diff --git a/MultiTerm.Wpf/MultiTerm.Wpf.csproj b/MultiTerm.Wpf/MultiTerm.Wpf.csproj
index 86713c1..9fc5953 100644
--- a/MultiTerm.Wpf/MultiTerm.Wpf.csproj
+++ b/MultiTerm.Wpf/MultiTerm.Wpf.csproj
@@ -1,45 +1,70 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
-    <Nullable>enable</Nullable>
-    <UseWPF>true</UseWPF>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="Assets\mdi-console-white.png" />
-    <None Remove="Assets\mdi-import.png" />
-    <None Remove="Assets\mdi-keyboard.png" />
-    <None Remove="Assets\mdi-network.png" />
-    <None Remove="Assets\mdi-serial-port.png" />
-    <None Remove="Assets\mid-serial-port.png" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
-    <PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Common\Common.csproj" />
-    <ProjectReference Include="..\MultiTerm.Core\MultiTerm.Core.csproj" />
-    <ProjectReference Include="..\MultiTerm.Wpf.CustomControl\MultiTerm.Wpf.CustomControl.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Resource Include="Assets\mdi-console-white.png" />
-    <Resource Include="Assets\mdi-import.png" />
-    <Resource Include="Assets\mdi-keyboard.png" />
-    <Resource Include="Assets\mdi-network.png" />
-    <Resource Include="Assets\mdi-serial-port.png" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Compile Update="View\SettingsView\TcpClientSettingsView.xaml.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
+	<PropertyGroup>
+		<OutputType>WinExe</OutputType>
+		<TargetFramework>net6.0-windows</TargetFramework>
+		<Nullable>enable</Nullable>
+		<UseWPF>true</UseWPF>
+		<ApplicationIcon>Assets\console.ico</ApplicationIcon>
+		<IsPublishable>True</IsPublishable>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<None Remove="Assets\mdi-console-white.png" />
+		<None Remove="Assets\mdi-import.png" />
+		<None Remove="Assets\mdi-keyboard.png" />
+		<None Remove="Assets\mdi-network.png" />
+		<None Remove="Assets\mdi-serial-port.png" />
+		<None Remove="Assets\mid-serial-port.png" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Content Include="Assets\console.ico" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Content Include="..\MultiTerm.Protocols\UsbHid\hidapi.dll" Link="hidapi.dll">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+		<Content Include="..\MultiTerm.Protocols\UsbHid\hidapi.lib" Link="hidapi.lib">
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
+		<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\Common\Common.csproj" />
+		<ProjectReference Include="..\MultiTerm.Core\MultiTerm.Core.csproj" />
+		<ProjectReference Include="..\MultiTerm.Wpf.CustomControl\MultiTerm.Wpf.CustomControl.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Resource Include="Assets\mdi-console-white.png" />
+		<Resource Include="Assets\mdi-import.png" />
+		<Resource Include="Assets\mdi-keyboard.png" />
+		<Resource Include="Assets\mdi-network.png" />
+		<Resource Include="Assets\mdi-serial-port.png" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<Compile Update="View\SettingsView\TcpClientSettingsView.xaml.cs">
+			<SubType>Code</SubType>
+		</Compile>
+	</ItemGroup>
+
+	<!-- Overwrite AssemblyVersion with Published version, since in NET6 there is no access to the ApplicationDeployment class-->
+	<Target Name="SetAssemblyVersion" BeforeTargets="BeforeCompile">
+		<FormatVersion Version="$(ApplicationVersion)" Revision="$(ApplicationRevision)">
+			<Output PropertyName="AssemblyVersion" TaskParameter="OutputVersion" />
+		</FormatVersion>
+		<FormatVersion Version="$(ApplicationVersion)" Revision="$(ApplicationRevision)">
+			<Output PropertyName="FileVersion" TaskParameter="OutputVersion" />
+		</FormatVersion>
+	</Target>
 
 </Project>
diff --git a/MultiTerm.Wpf/Properties/PublishProfiles/ClickOnceProfile.pubxml b/MultiTerm.Wpf/Properties/PublishProfiles/ClickOnceProfile.pubxml
new file mode 100644
index 0000000..5dcae9d
--- /dev/null
+++ b/MultiTerm.Wpf/Properties/PublishProfiles/ClickOnceProfile.pubxml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+https://go.microsoft.com/fwlink/?LinkID=208121.
+-->
+<Project>
+  <PropertyGroup>
+    <ApplicationRevision>11</ApplicationRevision>
+    <ApplicationVersion>1.0.0.*</ApplicationVersion>
+    <BootstrapperEnabled>True</BootstrapperEnabled>
+    <Configuration>Release</Configuration>
+    <CreateDesktopShortcut>True</CreateDesktopShortcut>
+    <CreateWebPageOnPublish>True</CreateWebPageOnPublish>
+    <GenerateManifests>true</GenerateManifests>
+    <Install>True</Install>
+    <InstallFrom>Web</InstallFrom>
+    <InstallUrl>http://multiterm.iet-hslu.ch/installer/</InstallUrl>
+    <IsRevisionIncremented>True</IsRevisionIncremented>
+    <IsWebBootstrapper>True</IsWebBootstrapper>
+    <MapFileExtensions>True</MapFileExtensions>
+    <OpenBrowserOnPublish>False</OpenBrowserOnPublish>
+    <Platform>Any CPU</Platform>
+    <ProductName>MultiTerm</ProductName>
+    <PublishDir>bin\Release\net6.0-windows\app.publish\</PublishDir>
+    <PublishUrl>bin\publish\</PublishUrl>
+    <PublisherName>HSLU IET</PublisherName>
+    <PublishProtocol>ClickOnce</PublishProtocol>
+    <PublishReadyToRun>False</PublishReadyToRun>
+    <PublishSingleFile>False</PublishSingleFile>
+    <SelfContained>False</SelfContained>
+    <SignatureAlgorithm>sha256RSA</SignatureAlgorithm>
+    <SignManifests>True</SignManifests>
+    <TargetFramework>net6.0-windows</TargetFramework>
+    <UpdateEnabled>True</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateRequired>False</UpdateRequired>
+    <WebPageFileName>index.html</WebPageFileName>
+    <ManifestCertificateThumbprint>BC1274DD90DC13A3CE1634A82AC005CDB6852B06</ManifestCertificateThumbprint>
+    <ManifestKeyFile>MultiTerm.Wpf_TemporaryKey.pfx</ManifestKeyFile>
+    <History>True|2023-05-31T10:15:48.2252015Z;</History>
+  </PropertyGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.NetCore.DesktopRuntime.6.0.x64">
+      <Install>true</Install>
+      <ProductName>.NET Desktop Runtime 6.0.16 (x64)</ProductName>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <PublishFile Include="Assets\console.ico">
+      <Group>
+      </Group>
+      <TargetPath>
+      </TargetPath>
+      <PublishState>Include</PublishState>
+      <IncludeHash>true</IncludeHash>
+      <FileType>File</FileType>
+    </PublishFile>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/MultiTerm.Wpf/View/ShellView.xaml b/MultiTerm.Wpf/View/ShellView.xaml
index 9ebcc5c..3c5f278 100644
--- a/MultiTerm.Wpf/View/ShellView.xaml
+++ b/MultiTerm.Wpf/View/ShellView.xaml
@@ -77,6 +77,7 @@
             <!--<MenuItem Header="_View"/>-->
             <MenuItem Header="_Help">
                 <MenuItem Header="Logfiles" Click="MenuItem_Logfiles_Click"/>
+                <MenuItem x:Name="versionMenuItem" StaysOpenOnClick="True"/>
                 <!--<MenuItem Header="About MultiTerm"/>-->
             </MenuItem>
         </Menu>
diff --git a/MultiTerm.Wpf/View/ShellView.xaml.cs b/MultiTerm.Wpf/View/ShellView.xaml.cs
index 92a7e59..b8134f4 100644
--- a/MultiTerm.Wpf/View/ShellView.xaml.cs
+++ b/MultiTerm.Wpf/View/ShellView.xaml.cs
@@ -1,6 +1,7 @@
 using MultiTerm.Core.ViewModel;
 using System.Diagnostics;
 using System.IO;
+using System.Reflection;
 using System.Windows.Controls;
 
 namespace MultiTerm.Wpf.View;
@@ -11,6 +12,9 @@ public partial class ShellView : UserControl
     {
         InitializeComponent();
         this.DataContext = App.AppHost!.Services.GetService(typeof(ShellViewModel));
+
+        // set version item header
+        this.versionMenuItem.Header = $"MultiTerm Version {Assembly.GetExecutingAssembly().GetName().Version}";
     }
 
     /// <summary>
diff --git a/MultiTerm.sln b/MultiTerm.sln
index bffee60..83f2384 100644
--- a/MultiTerm.sln
+++ b/MultiTerm.sln
@@ -13,7 +13,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultiTerm.Wpf.CustomControl
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultiTerm.Protocols", "MultiTerm.Protocols\MultiTerm.Protocols.csproj", "{D35B996A-91EE-4A6A-BA82-C74684AF4572}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MultiTerm.Protocols.Tests", "MultiTerm.Core.Tests\MultiTerm.Protocols.Tests.csproj", "{E75D3FF4-61FB-4A7F-A75D-B9E69A2FAE78}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MultiTerm.Protocols.Tests", "MultiTerm.Core.Tests\MultiTerm.Protocols.Tests.csproj", "{E75D3FF4-61FB-4A7F-A75D-B9E69A2FAE78}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution