diff --git a/main.wxs b/main.wxs
index b723cbd9..c53fe531 100644
--- a/main.wxs
+++ b/main.wxs
@@ -74,7 +74,7 @@
             Execute="deferred"
             Impersonate="no"
             Return="ignore"
-            ExeCommand="Invoke-WebRequest -Uri 'https://npcap.com/dist/npcap-1.75.exe' -OutFile '$env:TEMP\npcap_installer.exe'; Start-Process -FilePath '$env:TEMP\npcap_installer.exe' -ArgumentList '/S' -Wait;"
+            ExeCommand="Invoke-WebRequest -Uri 'https://npcap.com/dist/npcap-1.60.exe' -OutFile '$env:TEMP\npcap_installer.exe'; Start-Process -FilePath '$env:TEMP\npcap_installer.exe' -ArgumentList '/S' -Wait;"
         />
 
         <InstallExecuteSequence>
@@ -96,6 +96,8 @@
             Schedule='afterInstallInitialize'
             DowngradeErrorMessage='A newer version of [ProductName] is already installed. Setup will now exit.'/>
 
+	<Icon Id='SetupIcon' SourceFile='resources\icons\sniffnet-windows.ico'/>
+
         <Media Id='1' Cabinet='media1.cab' EmbedCab='yes' DiskPrompt='CD-ROM #1'/>
         <Property Id='DiskPrompt' Value='sniffnet Installation'/>
 
@@ -138,14 +140,45 @@
                                 Id='exe0'
                                 Name='sniffnet.exe'
                                 DiskId='1'
-                                Source='$(var.CargoTargetBinDir)/sniffnet.exe'
+                                Source='$(var.CargoTargetBinDir)\sniffnet.exe'
                                 KeyPath='yes'/>
                         </Component>
                     </Directory>
                 </Directory>
             </Directory>
+	<Directory Id="ProgramMenuFolder">
+				<Directory Id="ApplicationProgramsFolder" Name="Sniffnet"/>
+			</Directory>
+			<Directory Id="DesktopFolder" Name="Desktop">
+			</Directory>
         </Directory>
 
+	<DirectoryRef Id="ApplicationProgramsFolder">
+			<Component Id="AppStart" Guid="d5886d8d-009d-4468-9db3-1ebc72f7c201">
+				<Shortcut Id="AppStartShortcut" 
+					Name="Sniffet" 
+					Description="Application to comfortably monitor your network traffic"
+					Target="[APPLICATIONFOLDER]bin\sniffnet.exe"
+					WorkingDirectory="APPLICATIONROOTDIRECTORY"
+					Icon="SetupIcon"/>
+				<RemoveFolder Id="ApplicationProgramsFolder" On="uninstall"/>
+				<RegistryValue Root="HKCU" Key="Software\gyulyvgc\sniffnet" Name="StartShortcut" Type="integer" Value="1" KeyPath="yes"/>
+		   </Component>
+		</DirectoryRef>
+		
+		<DirectoryRef Id="DesktopFolder">
+		    <Component Id="AppDesk" Guid="e7261bca-c8c3-4f7f-be81-eb3a7470bc7d">
+				<Shortcut Id="AppDeskShortcut"
+					Name="Sniffnet"
+					Description="Application to comfortably monitor your network traffic"
+					Target="[APPLICATIONFOLDER]bin\sniffnet.exe"
+					WorkingDirectory="APPLICATIONROOTDIRECTORY"
+					Icon="SetupIcon"/>
+				<RemoveFolder Id="DesktopFolder" On="uninstall"/>
+				<RegistryValue Root="HKCU" Key="Software\gyulyvgc\sniffnet" Name="DeskShortcut" Type="integer" Value="1" KeyPath="yes"/>
+			</Component>
+		</DirectoryRef>
+
         <Feature
             Id='Binaries'
             Title='Application'
@@ -174,6 +207,28 @@
             </Feature>
         </Feature>
 
+	<Feature
+			Id='StartShort'
+			Title='Start menu shortcut'
+			Description='Add a shortcut to the start menu'
+			Level='1'
+			AllowAdvertise='no'
+			Display='expand'
+			Absent='disallow'>
+			<ComponentRef Id="AppStart" /> 
+		</Feature>
+		
+		<Feature
+			Id='DeskShort'
+			Title='Desktop shortcut'
+			Description='Add a shortcut to the desktop'
+			Level='1'
+			AllowAdvertise='no'
+			Display='expand'
+			Absent='disallow'>
+			<ComponentRef Id="AppDesk" /> 
+		</Feature>
+
         <SetProperty Id='ARPINSTALLLOCATION' Value='[APPLICATIONFOLDER]' After='CostFinalize'/>
 
 
diff --git a/resources/icons/sniffnet-linux_1024x1024.png b/resources/icons/sniffnet-linux_1024x1024.png
index 31511bd3..86558324 100644
Binary files a/resources/icons/sniffnet-linux_1024x1024.png and b/resources/icons/sniffnet-linux_1024x1024.png differ
diff --git a/resources/icons/sniffnet-linux_128x128.png b/resources/icons/sniffnet-linux_128x128.png
index 9bccef7f..80649c4f 100644
Binary files a/resources/icons/sniffnet-linux_128x128.png and b/resources/icons/sniffnet-linux_128x128.png differ
diff --git a/resources/icons/sniffnet-linux_160x160.png b/resources/icons/sniffnet-linux_160x160.png
index fbd23986..36f51af6 100644
Binary files a/resources/icons/sniffnet-linux_160x160.png and b/resources/icons/sniffnet-linux_160x160.png differ
diff --git a/resources/icons/sniffnet-linux_16x16.png b/resources/icons/sniffnet-linux_16x16.png
index c85d5a69..66fe8c1a 100644
Binary files a/resources/icons/sniffnet-linux_16x16.png and b/resources/icons/sniffnet-linux_16x16.png differ
diff --git a/resources/icons/sniffnet-linux_192x192.png b/resources/icons/sniffnet-linux_192x192.png
index 3e8abfc0..98cb7f37 100644
Binary files a/resources/icons/sniffnet-linux_192x192.png and b/resources/icons/sniffnet-linux_192x192.png differ
diff --git a/resources/icons/sniffnet-linux_22x22.png b/resources/icons/sniffnet-linux_22x22.png
index 44a7b7f7..a6facd26 100644
Binary files a/resources/icons/sniffnet-linux_22x22.png and b/resources/icons/sniffnet-linux_22x22.png differ
diff --git a/resources/icons/sniffnet-linux_24x24.png b/resources/icons/sniffnet-linux_24x24.png
index 0ce99cd0..0efd089e 100644
Binary files a/resources/icons/sniffnet-linux_24x24.png and b/resources/icons/sniffnet-linux_24x24.png differ
diff --git a/resources/icons/sniffnet-linux_256x256.png b/resources/icons/sniffnet-linux_256x256.png
index b85d3c4c..887b1dce 100644
Binary files a/resources/icons/sniffnet-linux_256x256.png and b/resources/icons/sniffnet-linux_256x256.png differ
diff --git a/resources/icons/sniffnet-linux_32x32.png b/resources/icons/sniffnet-linux_32x32.png
index 7686da18..3f458e4e 100644
Binary files a/resources/icons/sniffnet-linux_32x32.png and b/resources/icons/sniffnet-linux_32x32.png differ
diff --git a/resources/icons/sniffnet-linux_36x36.png b/resources/icons/sniffnet-linux_36x36.png
index 2caab1fc..4bc6297a 100644
Binary files a/resources/icons/sniffnet-linux_36x36.png and b/resources/icons/sniffnet-linux_36x36.png differ
diff --git a/resources/icons/sniffnet-linux_384x384.png b/resources/icons/sniffnet-linux_384x384.png
index 1917e305..460edeba 100644
Binary files a/resources/icons/sniffnet-linux_384x384.png and b/resources/icons/sniffnet-linux_384x384.png differ
diff --git a/resources/icons/sniffnet-linux_42x42.png b/resources/icons/sniffnet-linux_42x42.png
index 7a6d4b95..34295ed9 100644
Binary files a/resources/icons/sniffnet-linux_42x42.png and b/resources/icons/sniffnet-linux_42x42.png differ
diff --git a/resources/icons/sniffnet-linux_48x48.png b/resources/icons/sniffnet-linux_48x48.png
index 848dd5e4..a4a7e54b 100644
Binary files a/resources/icons/sniffnet-linux_48x48.png and b/resources/icons/sniffnet-linux_48x48.png differ
diff --git a/resources/icons/sniffnet-linux_512x512.png b/resources/icons/sniffnet-linux_512x512.png
index 52b1b6f7..c5c73844 100644
Binary files a/resources/icons/sniffnet-linux_512x512.png and b/resources/icons/sniffnet-linux_512x512.png differ
diff --git a/resources/icons/sniffnet-linux_64x64.png b/resources/icons/sniffnet-linux_64x64.png
index 11770bfe..dcbbaf69 100644
Binary files a/resources/icons/sniffnet-linux_64x64.png and b/resources/icons/sniffnet-linux_64x64.png differ
diff --git a/resources/icons/sniffnet-linux_72x72.png b/resources/icons/sniffnet-linux_72x72.png
index 5ad28c35..04165110 100644
Binary files a/resources/icons/sniffnet-linux_72x72.png and b/resources/icons/sniffnet-linux_72x72.png differ
diff --git a/resources/icons/sniffnet-linux_8x8.png b/resources/icons/sniffnet-linux_8x8.png
index ada774dc..0d5a14df 100644
Binary files a/resources/icons/sniffnet-linux_8x8.png and b/resources/icons/sniffnet-linux_8x8.png differ
diff --git a/resources/icons/sniffnet-linux_96x96.png b/resources/icons/sniffnet-linux_96x96.png
index f1fb021e..f5f305c3 100644
Binary files a/resources/icons/sniffnet-linux_96x96.png and b/resources/icons/sniffnet-linux_96x96.png differ
diff --git a/resources/icons/sniffnet-macos.icns b/resources/icons/sniffnet-macos.icns
index ae642e6c..1a1f6bf8 100644
Binary files a/resources/icons/sniffnet-macos.icns and b/resources/icons/sniffnet-macos.icns differ
diff --git a/resources/icons/sniffnet-windows.ico b/resources/icons/sniffnet-windows.ico
index a59f7103..90b79143 100644
Binary files a/resources/icons/sniffnet-windows.ico and b/resources/icons/sniffnet-windows.ico differ
diff --git a/resources/logos/icon.png b/resources/logos/icon.png
index 55ddab7c..c5c73844 100644
Binary files a/resources/logos/icon.png and b/resources/logos/icon.png differ
diff --git a/resources/logos/icon_window.png b/resources/logos/icon_window.png
deleted file mode 100644
index 7cf4c344..00000000
Binary files a/resources/logos/icon_window.png and /dev/null differ