diff --git a/.editorconfig b/.editorconfig
index cab8f8e..821c6e0 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -7,3 +7,6 @@ insert_final_newline = true
 charset = utf-8
 indent_style = space
 indent_size = 4
+
+[*.{xml,wxs}]
+indent_size = 2
diff --git a/.github/workflows/build.ps1 b/.github/workflows/build.ps1
index 3d7c4e4..895ca17 100644
--- a/.github/workflows/build.ps1
+++ b/.github/workflows/build.ps1
@@ -52,12 +52,18 @@ Function FindMsBuild() {
     return $msbuild
 }
 
+Function RemoveFileIfExists($fileName) {
+    Info "Remove '$fileName'"
+    Remove-Item $fileName  -Force  -Recurse -ErrorAction SilentlyContinue
+}
+
 Set-StrictMode -Version Latest
 $ErrorActionPreference = "Stop"
 $ProgressPreference = "SilentlyContinue"
 
 $root = Resolve-Path "$PSScriptRoot/../.."
-$publishDir = "$root/build/Release"
+$buildDir = "$root/build"
+$publishDir = "$buildDir/Release"
 $projectName = "ShowWhatProcessLocksFile"
 $version = GetVersion
 $installerVersion = GetInstallerVersion $version
@@ -65,9 +71,6 @@ $msbuild = FindMsBuild
 
 Info "Version: '$version'. InstallerVersion: '$installerVersion'"
 
-Info "Remove Publish directory `n $publishDir"
-Remove-Item $publishDir  -Force  -Recurse -ErrorAction SilentlyContinue
-
 Info "Build project"
 & $msbuild `
     /property:RestorePackagesConfig=true `
@@ -80,10 +83,18 @@ Info "Build project"
     $root/$projectName.sln
 CheckReturnCodeOfPreviousCommand "build failed"
 
-# TODO: there are no processes which lock files on Github Actions executors. It makes a lot of test fail.
-# Info "Run tests"
-# & "$root/build/nuget/nunit.consolerunner/*/tools/nunit3-console.exe" `
-#     $publishDir/net461/Test.dll `
-#     --stoponerror `
-#     --noresult
-# CheckReturnCodeOfPreviousCommand "tests failed"
+RemoveFileIfExists "$publishDir/${projectName}.msi.zip"
+Info "Create zip archive from msi installer"
+Compress-Archive -Path "$publishDir/$projectName.msi" -DestinationPath "$publishDir/${projectName}.msi.zip"
+
+# Skip running tests if the build script is run on Github Actions.
+# There are no processes which lock files on Github Actions executors. It makes a lot of test fail.
+if ($null -eq $env:GITHUB_ACTIONS) {
+    & "$buildDir/nuget/nunit.consolerunner/*/tools/nunit3-console.exe" `
+           "$publishDir/net461/Test.dll" `
+           --stoponerror `
+           --labels=Before `
+           --noheader `
+           --noresult
+    CheckReturnCodeOfPreviousCommand "tests failed"
+}
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
index daae550..55b683b 100644
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -12,8 +12,8 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           draft: true
-          files: Build/Release/*.msi
+          files: Build/Release/*.msi.zip
       - uses: actions/upload-artifact@v2
         with:
           name: Build artifacts
-          path: Build/Release/*.msi
+          path: Build/Release/*.msi.zip
diff --git a/README.md b/README.md
index 506cf10..d563c34 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,10 @@
 # ShowWhatProcessLocksFile
 An utility to discover what processes lock a specific file or folder.<br>
+
+# Screenshots
+## Context menu
 ![Screenshot](doc/ContextMenu.png)
-<br>
+## The application
 ![Screenshot](doc/Screenshot.png)
 
 # System requirements
@@ -12,8 +15,8 @@ An utility to discover what processes lock a specific file or folder.<br>
 The application uses [Handle by Mark Russinovich](https://docs.microsoft.com/en-us/sysinternals/downloads/handle) to get information about locking processes. The output of `handle.exe` is parsed and displayed in the GUI.<br>
 
 # How to use
-* Download `ShowWhatProcessLocksFile.msi` from the latest [release](https://github.com/PolarGoose/ShowWhatProcessLocksFile/releases).
-* Run the installer. The installer will install this programm to the `C:\Program Files\ShowWhatProcessLocksFile` folder and add a "Show what locks this file" Windows File Explorer context menu element.
+* Download `ShowWhatProcessLocksFile.msi.zip` from the latest [release](https://github.com/PolarGoose/ShowWhatProcessLocksFile/releases).
+* Run the installer. The installer will install this programm to the `%AppData%\ShowWhatProcessLocksFile` folder and add a "Show what locks this file" Windows File Explorer context menu element.
 * Use "Show what locks this file" File Explorer's context menu to select a file or folder
 * To terminate selected processes, open a context menu by clicking mouse right button
 * If you want to uninstall the program, use `Control Panel\Programs\Programs and Features`, uninstaller will remove an integration with the context menu and all files which were installed.
diff --git a/doc/ContextMenu.png b/doc/ContextMenu.png
index c0d8fbd..d662344 100644
Binary files a/doc/ContextMenu.png and b/doc/ContextMenu.png differ
diff --git a/doc/Screenshot.png b/doc/Screenshot.png
index 7bb400a..e40e19d 100644
Binary files a/doc/Screenshot.png and b/doc/Screenshot.png differ
diff --git a/src/App/Gui/Controls/ExpandToggleButton.xaml b/src/App/Gui/Controls/ExpandToggleButton.xaml
index 7aa9c43..f13c2d3 100644
--- a/src/App/Gui/Controls/ExpandToggleButton.xaml
+++ b/src/App/Gui/Controls/ExpandToggleButton.xaml
@@ -3,7 +3,25 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800">
-    <ToggleButton.Style>
        <Style TargetType="ToggleButton" BasedOn="{StaticResource {x:Type ToggleButton}}">
            <Setter Property="Content">
                <Setter.Value>
                    <Image Source="/Gui/Icons/ExpandRight_md_16x.png"/>
                </Setter.Value>
            </Setter>
            <Style.Triggers>
                <Trigger Property="IsChecked" Value="True">
                    <Setter Property="Content">
                        <Setter.Value>
                            <Image Source="/Gui/Icons/ExpandDown_md_16x.png"/>
                        </Setter.Value>
                    </Setter>
                </Trigger>
            </Style.Triggers>
        </Style>
    </ToggleButton.Style>
+    <ToggleButton.Style>
+        <Style TargetType="ToggleButton" BasedOn="{StaticResource {x:Type ToggleButton}}">
+            <Setter Property="Content">
+                <Setter.Value>
+                    <svgc:SvgViewbox Source="/Gui/Icons/ExpandRight_md_16x.svg"/>
+                </Setter.Value>
+            </Setter>
+            <Style.Triggers>
+                <Trigger Property="IsChecked" Value="True">
+                    <Setter Property="Content">
+                        <Setter.Value>
+                            <svgc:SvgViewbox Source="/Gui/Icons/ExpandDown_md_16x.svg"/>
+                        </Setter.Value>
+                    </Setter>
+                </Trigger>
+            </Style.Triggers>
+        </Style>
+    </ToggleButton.Style>
 </ToggleButton>
diff --git a/src/App/Gui/Controls/IconButton.xaml b/src/App/Gui/Controls/IconButton.xaml
index 3b8a9db..1856d32 100644
--- a/src/App/Gui/Controls/IconButton.xaml
+++ b/src/App/Gui/Controls/IconButton.xaml
@@ -3,8 +3,9 @@
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
              x:Name="self"
              mc:Ignorable="d"
              d:DesignHeight="450" d:DesignWidth="800">
-    <Image Source="{Binding Icon, ElementName=self}"/>
+    <svgc:SvgViewbox Source="{Binding Icon, ElementName=self}"/>
 </Button>
diff --git a/src/App/Gui/Controls/IconButton.xaml.cs b/src/App/Gui/Controls/IconButton.xaml.cs
index bef3ee6..c21036d 100644
--- a/src/App/Gui/Controls/IconButton.xaml.cs
+++ b/src/App/Gui/Controls/IconButton.xaml.cs
@@ -1,19 +1,19 @@
+using System;
 using System.Windows;
 using System.Windows.Controls;
-using System.Windows.Media;
 
 namespace ShowWhatProcessLocksFile.Gui.Controls
 {
     public partial class IconButton : Button
     {
-        public ImageSource Icon
+        public Uri Icon
         {
-            get => (ImageSource)GetValue(IconProperty);
+            get => (Uri)GetValue(IconProperty);
             set => SetValue(IconProperty, value);
         }
 
         public static readonly DependencyProperty IconProperty =
-            DependencyProperty.Register("Icon", typeof(ImageSource), typeof(IconButton));
+            DependencyProperty.Register("Icon", typeof(Uri), typeof(IconButton));
 
         public IconButton()
         {
diff --git a/src/App/Gui/Controls/ProcessInfoListView.xaml b/src/App/Gui/Controls/ProcessInfoListView.xaml
index e2819e3..804521d 100644
--- a/src/App/Gui/Controls/ProcessInfoListView.xaml
+++ b/src/App/Gui/Controls/ProcessInfoListView.xaml
@@ -14,8 +14,8 @@
         </Grid.RowDefinitions>
 
         <StackPanel Grid.Row="0" Orientation="Horizontal">
-            <local:IconButton Height="21" Width="21" Margin="2" Command="{Binding ExpandAllCommand}" Icon="/Gui/Icons/ExpandAll_16x.png" ToolTip="Expand All"/>
-            <local:IconButton Height="21" Width="21" Margin="2" Command="{Binding CollapseAllCommand}" Icon="/Gui/Icons/CollapseAll_16x.png" ToolTip="Collapse All"/>
+            <local:IconButton Height="21" Width="21" Margin="2" Command="{Binding ExpandAllCommand}" Icon="/Gui/Icons/ExpandAll_16x.svg" ToolTip="Expand All"/>
+            <local:IconButton Height="21" Width="21" Margin="2" Command="{Binding CollapseAllCommand}" Icon="/Gui/Icons/CollapseAll_16x.svg" ToolTip="Collapse All"/>
         </StackPanel>
 
         <ListBox x:Name="processInfoList"  Grid.Row="1" SelectionMode="Extended" ItemsSource="{Binding ProcessInfoViewModels}" ScrollViewer.CanContentScroll="False">
diff --git a/src/App/Gui/Controls/ProcessInfoListViewModel.cs b/src/App/Gui/Controls/ProcessInfoListViewModel.cs
index b8e557f..e99fa66 100644
--- a/src/App/Gui/Controls/ProcessInfoListViewModel.cs
+++ b/src/App/Gui/Controls/ProcessInfoListViewModel.cs
@@ -1,5 +1,5 @@
 using ShowWhatProcessLocksFile.Gui.Utils;
-using ShowWhatProcessLocksFile.LockingProcessesInfo;
+using ShowWhatProcessLocksFile.LockFinding;
 using System;
 using System.Collections.Generic;
 using System.Linq;
diff --git a/src/App/Gui/Controls/ProcessInfoView.xaml b/src/App/Gui/Controls/ProcessInfoView.xaml
index fbe5252..7bb3453 100644
--- a/src/App/Gui/Controls/ProcessInfoView.xaml
+++ b/src/App/Gui/Controls/ProcessInfoView.xaml
@@ -1,8 +1,44 @@
-<UserControl x:Class="ShowWhatProcessLocksFile.Gui.Controls.ProcessInfoView"
             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+<UserControl x:Class="ShowWhatProcessLocksFile.Gui.Controls.ProcessInfoView"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
              xmlns:local="clr-namespace:ShowWhatProcessLocksFile.Gui.Controls"
-             xmlns:utils="clr-namespace:ShowWhatProcessLocksFile.Gui.Utils"
             mc:Ignorable="d"
             d:DesignHeight="450" d:DesignWidth="800"
-             d:DataContext="{d:DesignInstance Type=local:ProcessInfoViewModel, IsDesignTimeCreatable=False}">
    <UserControl.Resources>
        <utils:BooleanToCollapsedVisibilityConverter x:Key="BooleanToCollapsedVisibilityConverter"/>
    </UserControl.Resources>
    <Grid>
        <Grid.ColumnDefinitions>
            <ColumnDefinition Width="auto" />
            <ColumnDefinition Width="auto" />
            <ColumnDefinition Width="*" />
        </Grid.ColumnDefinitions>
        <Grid.RowDefinitions>
            <RowDefinition Height="auto" />
            <RowDefinition Height="*" />
        </Grid.RowDefinitions>

        <local:ExpandToggleButton IsChecked="{Binding IsExpanded}" Grid.Column="0" Grid.Row="0" Margin="5" Height="20" Width="20"/>
-
        <Image Grid.Column="1" Grid.Row="0" Source="{Binding Process.Icon}" Height="32" Width="32" Margin="5"/>
-
        <TextBlock Grid.Column="2" Grid.Row="0" Margin="5" FontSize="12">
            <Run FontWeight="Bold" Text="{Binding Process.Name, Mode=OneWay}"/> <LineBreak/>
            Pid: <Run Text="{Binding Process.Pid, Mode=OneWay}"/>, <Run Text="{Binding Process.ExecutableFullName, Mode=OneWay}"/>
        </TextBlock>
-
        <ItemsControl Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" x:Name="LockedFiles"
                      ItemsSource="{Binding Process.LockedFiles}"
-                      Visibility="{Binding IsExpanded, Converter={StaticResource BooleanToCollapsedVisibilityConverter}}">
            <ItemsControl.ItemTemplate>
                <DataTemplate>
                    <TextBlock Margin="20, 2, 2, 2" Text="{Binding}"></TextBlock>
                </DataTemplate>
            </ItemsControl.ItemTemplate>
        </ItemsControl>
    </Grid>
</UserControl>
\ No newline at end of file
+             xmlns:utils="clr-namespace:ShowWhatProcessLocksFile.Gui.Utils"
+             mc:Ignorable="d"
+             d:DesignHeight="450" d:DesignWidth="800"
+             d:DataContext="{d:DesignInstance Type=local:ProcessInfoViewModel, IsDesignTimeCreatable=False}">
+    <UserControl.Resources>
+        <utils:BooleanToCollapsedVisibilityConverter x:Key="BooleanToCollapsedVisibilityConverter"/>
+    </UserControl.Resources>
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="auto" />
+            <ColumnDefinition Width="auto" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+
+        <local:ExpandToggleButton IsChecked="{Binding IsExpanded}" Grid.Column="0" Grid.Row="0" Margin="5" Height="20" Width="20"/>
+
+        <Image Grid.Column="1" Grid.Row="0" Source="{Binding Process.Icon}" Height="32" Width="32" Margin="5"/>
+
+        <TextBlock Grid.Column="2" Grid.Row="0" Margin="5" FontSize="12">
+            <Run FontWeight="Bold" Text="{Binding Process.Name, Mode=OneWay}"/> <LineBreak/>
+            Pid: <Run Text="{Binding Process.Pid, Mode=OneWay}"/>, <Run Text="{Binding Process.ExecutableFullName, Mode=OneWay}"/>
+        </TextBlock>
+
+        <ItemsControl Grid.Row="1" Grid.Column="0" Grid.ColumnSpan="3" x:Name="LockedFiles"
+                      ItemsSource="{Binding Process.LockedFiles}"
+                      Visibility="{Binding IsExpanded, Converter={StaticResource BooleanToCollapsedVisibilityConverter}}">
+            <ItemsControl.ItemTemplate>
+                <DataTemplate>
+                    <TextBlock Margin="20, 2, 2, 2" Text="{Binding}"></TextBlock>
+                </DataTemplate>
+            </ItemsControl.ItemTemplate>
+        </ItemsControl>
+    </Grid>
+</UserControl>
diff --git a/src/App/Gui/Controls/ProcessInfoViewModel.cs b/src/App/Gui/Controls/ProcessInfoViewModel.cs
index 9ee1fa8..4f6d97b 100644
--- a/src/App/Gui/Controls/ProcessInfoViewModel.cs
+++ b/src/App/Gui/Controls/ProcessInfoViewModel.cs
@@ -1,4 +1,4 @@
-using ShowWhatProcessLocksFile.LockingProcessesInfo;
+using ShowWhatProcessLocksFile.LockFinding;
 
 namespace ShowWhatProcessLocksFile.Gui.Controls
 {
diff --git a/src/App/Gui/Controls/ResultTextView.xaml b/src/App/Gui/Controls/ResultTextView.xaml
index 5f173ba..63ed854 100644
--- a/src/App/Gui/Controls/ResultTextView.xaml
+++ b/src/App/Gui/Controls/ResultTextView.xaml
@@ -2,15 +2,25 @@
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
-             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:svgc="http://sharpvectors.codeplex.com/svgc/"
              xmlns:local="clr-namespace:ShowWhatProcessLocksFile.Gui.Controls"
              mc:Ignorable="d" 
              d:DesignHeight="450" d:DesignWidth="800"
-             d:DataContext="{d:DesignInstance Type=local:ResultTextView, IsDesignTimeCreatable=False}">
+             d:DataContext="{d:DesignInstance Type=local:ResultTextViewModel, IsDesignTimeCreatable=False}">
     <StackPanel Orientation="Horizontal">
-        <Image Height="16" Margin="2" VerticalAlignment="Top">
-            <Image.Style>
                <Style TargetType="Image">
                    <Setter Property="Source" Value="/Gui/Icons/StatusCriticalError_16x.png"/>
                    <Style.Triggers>
                        <DataTrigger Binding="{Binding Success}" Value="True">
                            <Setter Property="Source" Value="/Gui/Icons/Checkmark_16x.png"/>
                        </DataTrigger>
                    </Style.Triggers>
                </Style>
            </Image.Style>
-        </Image>
+        <svgc:SvgViewbox Height="16" Margin="2" VerticalAlignment="Top">
+            <svgc:SvgViewbox.Style>
+                <Style TargetType="svgc:SvgViewbox">
+                    <Setter Property="Source" Value="/Gui/Icons/StatusCriticalError_16x.svg"/>
+                    <Style.Triggers>
+                        <DataTrigger Binding="{Binding Success}" Value="True">
+                            <Setter Property="Source" Value="/Gui/Icons/Checkmark_16x.svg"/>
+                        </DataTrigger>
+                    </Style.Triggers>
+                </Style>
+            </svgc:SvgViewbox.Style>
+        </svgc:SvgViewbox>
         <TextBox Background="Transparent"
                  BorderThickness="0"
                  VerticalAlignment="Center"
diff --git a/src/App/Gui/Icons/Checkmark_16x.png b/src/App/Gui/Icons/Checkmark_16x.png
deleted file mode 100644
index 27b8a6f..0000000
Binary files a/src/App/Gui/Icons/Checkmark_16x.png and /dev/null differ
diff --git a/src/App/Gui/Icons/Checkmark_16x.svg b/src/App/Gui/Icons/Checkmark_16x.svg
new file mode 100644
index 0000000..074a5aa
--- /dev/null
+++ b/src/App/Gui/Icons/Checkmark_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-action-green{fill:#388a34;}</style></defs><title>Checkmark_16x</title><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/><path class="icon-vs-out" d="M16,4.586v.242l-10,10-6-6V8.586L2.707,5.879,6,9.172l7.293-7.293Z"/><path class="icon-vs-action-green" d="M14.707,4.707,6,13.414,1.293,8.707,2.707,7.293,6,10.586l7.293-7.293Z"/></svg>
\ No newline at end of file
diff --git a/src/App/Gui/Icons/CollapseAll_16x.png b/src/App/Gui/Icons/CollapseAll_16x.png
deleted file mode 100644
index 315b176..0000000
Binary files a/src/App/Gui/Icons/CollapseAll_16x.png and /dev/null differ
diff --git a/src/App/Gui/Icons/CollapseAll_16x.svg b/src/App/Gui/Icons/CollapseAll_16x.svg
new file mode 100644
index 0000000..742d5e4
--- /dev/null
+++ b/src/App/Gui/Icons/CollapseAll_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-bg{fill:#424242;}.icon-vs-action-blue{fill:#00539c;}</style></defs><title>CollapseAll_16x</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,16H0V0H16Z"/></g><g id="outline"><path class="icon-vs-out" d="M1,15V2H2V0H16V14H14v1Z"/></g><g id="iconBg"><path class="icon-vs-bg" d="M2,14H13V3H2ZM3,4h9v9H3ZM15,1V13H14V2H3V1Z"/></g><g id="colorAction"><path class="icon-vs-action-blue" d="M11,9H4V8h7Z"/></g></svg>
\ No newline at end of file
diff --git a/src/App/Gui/Icons/ExpandAll_16x.png b/src/App/Gui/Icons/ExpandAll_16x.png
deleted file mode 100644
index 7fe3a9c..0000000
Binary files a/src/App/Gui/Icons/ExpandAll_16x.png and /dev/null differ
diff --git a/src/App/Gui/Icons/ExpandAll_16x.svg b/src/App/Gui/Icons/ExpandAll_16x.svg
new file mode 100644
index 0000000..2cb452c
--- /dev/null
+++ b/src/App/Gui/Icons/ExpandAll_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-bg{fill:#424242;}.icon-vs-action-blue{fill:#00539c;}</style></defs><title>ExpandAll_16x</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,16H0V0H16Z"/></g><g id="outline"><path class="icon-vs-out" d="M1,15V2H2V0H16V14H14v1Z"/></g><g id="iconBg"><path class="icon-vs-bg" d="M2,14H13V3H2ZM3,4h9v9H3ZM15,1V13H14V2H3V1Z"/></g><g id="colorAction"><path class="icon-vs-action-blue" d="M11,9H8v3H7V9H4V8H7V5H8V8h3Z"/></g></svg>
\ No newline at end of file
diff --git a/src/App/Gui/Icons/ExpandDown_md_16x.png b/src/App/Gui/Icons/ExpandDown_md_16x.png
deleted file mode 100644
index 1a0d30d..0000000
Binary files a/src/App/Gui/Icons/ExpandDown_md_16x.png and /dev/null differ
diff --git a/src/App/Gui/Icons/ExpandDown_md_16x.svg b/src/App/Gui/Icons/ExpandDown_md_16x.svg
new file mode 100644
index 0000000..481d0d6
--- /dev/null
+++ b/src/App/Gui/Icons/ExpandDown_md_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-bg{fill:#424242;}</style></defs><title>CollapseChevronDown_md_16x</title><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/><path class="icon-vs-out" d="M15.444,6.061,8,13.5.556,6.061,3.03,3.586,8,8.556l4.97-4.97Z"/><path class="icon-vs-bg" d="M14.03,6.061,8,12.091,1.97,6.061,3.03,5,8,9.97,12.97,5Z"/></svg>
\ No newline at end of file
diff --git a/src/App/Gui/Icons/ExpandRight_md_16x.png b/src/App/Gui/Icons/ExpandRight_md_16x.png
deleted file mode 100644
index cbdfe43..0000000
Binary files a/src/App/Gui/Icons/ExpandRight_md_16x.png and /dev/null differ
diff --git a/src/App/Gui/Icons/ExpandRight_md_16x.svg b/src/App/Gui/Icons/ExpandRight_md_16x.svg
new file mode 100644
index 0000000..35e081a
--- /dev/null
+++ b/src/App/Gui/Icons/ExpandRight_md_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-bg{fill:#424242;}</style></defs><title>ExpandChevronRight_md_16x</title><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/><path class="icon-vs-out" d="M13.225,8,5.78,15.444,3.306,12.97,8.275,8,3.306,3.03,5.78.556Z"/><path class="icon-vs-bg" d="M11.811,8,5.78,14.03,4.72,12.97,9.689,8,4.72,3.03,5.78,1.97Z"/></svg>
\ No newline at end of file
diff --git a/src/App/Gui/Icons/Refresh_16x.png b/src/App/Gui/Icons/Refresh_16x.png
deleted file mode 100644
index 23ffe55..0000000
Binary files a/src/App/Gui/Icons/Refresh_16x.png and /dev/null differ
diff --git a/src/App/Gui/Icons/Refresh_16x.svg b/src/App/Gui/Icons/Refresh_16x.svg
new file mode 100644
index 0000000..6167e43
--- /dev/null
+++ b/src/App/Gui/Icons/Refresh_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-action-blue{fill:#00539c;}</style></defs><title>Refresh_16x</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,0V16H0V0Z"/></g><g id="outline"><path class="icon-vs-out" d="M16,8A8,8,0,1,1,1.088,4H0V0H8V8H4a4,4,0,1,0,6.21-3.334l-.833-.554L11.592.78l.833.553A7.992,7.992,0,0,1,16,8Z"/></g><g id="iconBg"><path class="icon-vs-action-blue" d="M15,8A7,7,0,1,1,3.12,3H1V1H7V7H5V4a5,5,0,1,0,5.764-.169l1.107-1.666A6.989,6.989,0,0,1,15,8Z"/></g></svg>
\ No newline at end of file
diff --git a/src/App/Gui/Icons/StatusCriticalError_16x.png b/src/App/Gui/Icons/StatusCriticalError_16x.png
deleted file mode 100644
index 876b3de..0000000
Binary files a/src/App/Gui/Icons/StatusCriticalError_16x.png and /dev/null differ
diff --git a/src/App/Gui/Icons/StatusCriticalError_16x.svg b/src/App/Gui/Icons/StatusCriticalError_16x.svg
new file mode 100644
index 0000000..1d4645a
--- /dev/null
+++ b/src/App/Gui/Icons/StatusCriticalError_16x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.icon-canvas-transparent,.icon-vs-out{fill:#f6f6f6;}.icon-canvas-transparent{opacity:0;}.icon-vs-red{fill:#e51400;}.icon-white{fill:#fff;}</style></defs><title>StatusCriticalError_16x</title><g id="canvas"><path class="icon-canvas-transparent" d="M16,16H0V0H16Z"/></g><g id="outline"><path class="icon-vs-out" d="M16,8A8,8,0,1,1,8,0,8,8,0,0,1,16,8Z"/></g><g id="iconBg"><path class="icon-vs-red" d="M8,1a7,7,0,1,0,7,7A7,7,0,0,0,8,1Zm4.414,10L11,12.414l-3-3-3,3L3.586,11l3-3-3-3L5,3.586l3,3,3-3L12.414,5l-3,3Z"/><path class="icon-white" d="M9.414,8l3,3L11,12.414l-3-3-3,3L3.586,11l3-3-3-3L5,3.586l3,3,3-3L12.414,5Z"/></g></svg>
\ No newline at end of file
diff --git a/src/App/Gui/MainWindow.xaml b/src/App/Gui/MainWindow.xaml
index d38fd58..5b55f1a 100644
--- a/src/App/Gui/MainWindow.xaml
+++ b/src/App/Gui/MainWindow.xaml
@@ -21,8 +21,8 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
 
-            <TextBox Margin="2" Grid.Column="0" IsReadOnly="True" Text="{Binding FilePath, Mode=OneWay}" FontSize="14"/>
-            <controls:IconButton Grid.Column="1" Margin="2" Command="{Binding RefreshCommand}" Icon="/Gui/Icons/Refresh_16x.png" ToolTip="Refresh"/>
+            <TextBox Margin="2" Grid.Column="0" IsReadOnly="True" Text="{Binding FilePath, Mode=OneWay}" FontSize="14" Padding="0,2,0,2"/>
+            <controls:IconButton Grid.Column="1" Margin="2" Command="{Binding RefreshCommand}" Icon="/Gui/Icons/Refresh_16x.svg" ToolTip="Refresh"/>
         </Grid>
         
         <ContentControl Grid.Row="1" Content="{Binding MainControl}">
diff --git a/src/App/Gui/MainWindowViewModel.cs b/src/App/Gui/MainWindowViewModel.cs
index 7524689..99e63fb 100644
--- a/src/App/Gui/MainWindowViewModel.cs
+++ b/src/App/Gui/MainWindowViewModel.cs
@@ -1,6 +1,6 @@
 using ShowWhatProcessLocksFile.Gui.Controls;
 using ShowWhatProcessLocksFile.Gui.Utils;
-using ShowWhatProcessLocksFile.LockingProcessesInfo;
+using ShowWhatProcessLocksFile.LockFinding;
 using ShowWhatProcessLocksFile.Utils;
 using System;
 using System.Collections.Generic;
@@ -43,7 +43,7 @@ public async void GetLockingInformation()
 
             try
             {
-                var res = await Task.Run(() => ProcessesInfoRetriever.GetProcessesInfo(FilePath));
+                var res = await Task.Run(() => LockFinder.FindWhatProcessesLockPath(FilePath).ToList());
                 if (res.Any())
                 {
                     MainControl = new ProcessInfoListViewModel(res, OnProcessesKillRequested);
diff --git a/src/App/Icon/SvgToIco.ps1 b/src/App/Icon/SvgToIco.ps1
new file mode 100644
index 0000000..3abfb4c
--- /dev/null
+++ b/src/App/Icon/SvgToIco.ps1
@@ -0,0 +1,18 @@
+Set-StrictMode -Version Latest
+$ErrorActionPreference = "Stop"
+
+# The script requires https://imagemagick.org/script/download.php
+$imageMagickCommand = Get-Command -Name magick
+
+$iconResolutions = 16,20,24,32,40,48,64,256
+$pngImages = @()
+Foreach($r in $iconResolutions) {
+    & $imageMagickCommand convert -size "${r}x${r}" -depth 8 "$PSScriptRoot/icon.svg" "${r}.png"
+    $pngImages += "${r}.png"
+}
+
+& $imageMagickCommand convert $pngImages -compress jpeg "icon.ico"
+
+Foreach($image in $pngImages) {
+    Remove-Item $image
+}
diff --git a/src/App/Icon/icon.ico b/src/App/Icon/icon.ico
new file mode 100644
index 0000000..56e4644
Binary files /dev/null and b/src/App/Icon/icon.ico differ
diff --git a/src/App/Icon/icon.svg b/src/App/Icon/icon.svg
new file mode 100644
index 0000000..b35f706
--- /dev/null
+++ b/src/App/Icon/icon.svg
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   version="1.1"
+   id="Capa_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 58 58"
+   style="enable-background:new 0 0 58 58;"
+   xml:space="preserve"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><defs
+   id="defs63" />
+<g
+   id="g28"
+   transform="translate(5.3)">
+	<g
+   id="g18">
+		<polygon
+   style="fill:#efebde"
+   points="1.5,0 1.5,58 46.5,58 46.5,14 32.5,0 "
+   id="polygon2" />
+		<g
+   id="g14">
+			<path
+   style="fill:#d5d0bb"
+   d="m 11.5,23 h 25 c 0.552,0 1,-0.447 1,-1 0,-0.553 -0.448,-1 -1,-1 h -25 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 z"
+   id="path4" />
+			<path
+   style="fill:#d5d0bb"
+   d="m 11.5,15 h 10 c 0.552,0 1,-0.447 1,-1 0,-0.553 -0.448,-1 -1,-1 h -10 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 z"
+   id="path6" />
+			<path
+   style="fill:#d5d0bb"
+   d="m 36.5,29 h -25 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 h 25 c 0.552,0 1,-0.447 1,-1 0,-0.553 -0.448,-1 -1,-1 z"
+   id="path8" />
+			<path
+   style="fill:#d5d0bb"
+   d="m 36.5,37 h -25 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 h 25 c 0.552,0 1,-0.447 1,-1 0,-0.553 -0.448,-1 -1,-1 z"
+   id="path10" />
+			<path
+   style="fill:#d5d0bb"
+   d="m 36.5,45 h -25 c -0.552,0 -1,0.447 -1,1 0,0.553 0.448,1 1,1 h 25 c 0.552,0 1,-0.447 1,-1 0,-0.553 -0.448,-1 -1,-1 z"
+   id="path12" />
+		</g>
+		<polygon
+   style="fill:#d5d0bb"
+   points="46.5,14 32.5,0 32.5,14 "
+   id="polygon16" />
+	</g>
+	<g
+   id="g26">
+		<rect
+   x="13.61396"
+   y="28.063818"
+   style="fill:#cbb292"
+   width="20"
+   height="16"
+   id="rect20" />
+		<path
+   style="fill:#7f5c53"
+   d="m 26.61396,35.063818 c 0,-1.657 -1.343,-3 -3,-3 -1.657,0 -3,1.343 -3,3 0,1.317 0.854,2.424 2.035,2.827 -0.011,0.058 -0.035,0.112 -0.035,0.173 v 2 c 0,0.552 0.448,1 1,1 0.552,0 1,-0.448 1,-1 v -2 c 0,-0.061 -0.024,-0.115 -0.035,-0.173 1.181,-0.403 2.035,-1.51 2.035,-2.827 z"
+   id="path22" />
+		<path
+   style="fill:#bdc3c7"
+   d="m 18.61396,26.063818 c 0,-2.757 2.243,-5 5,-5 2.757,0 5,2.243 5,5 v 2 h 2 v -2 c 0,-3.86 -3.14,-7 -7,-7 -3.86,0 -7,3.14 -7,7 v 2 h 2 z"
+   id="path24" />
+	</g>
+</g>
+<g
+   id="g30">
+</g>
+<g
+   id="g32">
+</g>
+<g
+   id="g34">
+</g>
+<g
+   id="g36">
+</g>
+<g
+   id="g38">
+</g>
+<g
+   id="g40">
+</g>
+<g
+   id="g42">
+</g>
+<g
+   id="g44">
+</g>
+<g
+   id="g46">
+</g>
+<g
+   id="g48">
+</g>
+<g
+   id="g50">
+</g>
+<g
+   id="g52">
+</g>
+<g
+   id="g54">
+</g>
+<g
+   id="g56">
+</g>
+<g
+   id="g58">
+</g>
+<g
+   id="g2443"
+   transform="matrix(1.6218621,0,0,1.6218621,-25.469185,-28.338614)"><circle
+     style="opacity:0.4;fill:#d0e8f9"
+     cx="33.823982"
+     cy="37.749001"
+     id="circle20"
+     r="9.7959995" /><path
+     style="fill:#8697cb"
+     d="M 47.77,51.244 41.8,45 c 1.746,-1.919 2.82,-4.458 2.82,-7.251 0,-5.953 -4.842,-10.796 -10.796,-10.796 -5.954,0 -10.796,4.843 -10.796,10.796 0,5.953 4.843,10.796 10.796,10.796 2.442,0 4.689,-0.824 6.499,-2.196 l 6.001,6.276 c 0.196,0.206 0.459,0.309 0.723,0.309 0.249,0 0.497,-0.092 0.691,-0.277 0.399,-0.381 0.414,-1.015 0.032,-1.413 z M 25.029,37.749 c 0,-4.85 3.946,-8.796 8.796,-8.796 4.85,0 8.796,3.946 8.796,8.796 0,4.85 -3.946,8.796 -8.796,8.796 -4.85,0 -8.796,-3.946 -8.796,-8.796 z"
+     id="path24-8" /></g></svg>
diff --git a/src/App/LockingProcessesInfo/HandleExe/CommandLine.cs b/src/App/LockFinding/HandleExe/CommandLine.cs
similarity index 92%
rename from src/App/LockingProcessesInfo/HandleExe/CommandLine.cs
rename to src/App/LockFinding/HandleExe/CommandLine.cs
index 88f7479..3ff002a 100644
--- a/src/App/LockingProcessesInfo/HandleExe/CommandLine.cs
+++ b/src/App/LockFinding/HandleExe/CommandLine.cs
@@ -3,7 +3,7 @@
 using ShowWhatProcessLocksFile.Utils;
 using System;
 
-namespace ShowWhatProcessLocksFile.LockingProcessesInfo.HandleExe
+namespace ShowWhatProcessLocksFile.LockFinding.HandleExe
 {
     public static class CommandLine
     {
diff --git a/src/App/LockFinding/HandleExe/Handle.cs b/src/App/LockFinding/HandleExe/Handle.cs
new file mode 100644
index 0000000..0e59905
--- /dev/null
+++ b/src/App/LockFinding/HandleExe/Handle.cs
@@ -0,0 +1,19 @@
+using ShowWhatProcessLocksFile.Utils;
+using System;
+using System.IO;
+
+namespace ShowWhatProcessLocksFile.LockFinding.HandleExe
+{
+    public static class Handle
+    {
+        private static readonly string HandleExeFullName = Path.Combine(AppContext.BaseDirectory, "handle.exe");
+
+        public static string Execute(string fileFullName)
+        {
+            // Handle.exe doesn't work if a path contains "\" character at the end
+            fileFullName = PathUtils.RemoveTrailingPathSeparator(fileFullName);
+
+            return CommandLine.Execute(HandleExeFullName, $"-u -nobanner -accepteula \"{fileFullName}\"");
+        }
+    }
+}
diff --git a/src/App/LockingProcessesInfo/HandleExe/HandleOutputParser.cs b/src/App/LockFinding/HandleExe/HandleOutputParser.cs
similarity index 96%
rename from src/App/LockingProcessesInfo/HandleExe/HandleOutputParser.cs
rename to src/App/LockFinding/HandleExe/HandleOutputParser.cs
index ce5ce43..cf3a8e6 100644
--- a/src/App/LockingProcessesInfo/HandleExe/HandleOutputParser.cs
+++ b/src/App/LockFinding/HandleExe/HandleOutputParser.cs
@@ -3,7 +3,7 @@
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
-namespace ShowWhatProcessLocksFile.LockingProcessesInfo.HandleExe
+namespace ShowWhatProcessLocksFile.LockFinding.HandleExe
 {
     public class HandleOutputParser
     {
diff --git a/src/App/LockingProcessesInfo/HandleExe/HandleParsedLine.cs b/src/App/LockFinding/HandleExe/HandleParsedLine.cs
similarity index 93%
rename from src/App/LockingProcessesInfo/HandleExe/HandleParsedLine.cs
rename to src/App/LockFinding/HandleExe/HandleParsedLine.cs
index 7a8cf0f..7dd46b4 100644
--- a/src/App/LockingProcessesInfo/HandleExe/HandleParsedLine.cs
+++ b/src/App/LockFinding/HandleExe/HandleParsedLine.cs
@@ -1,4 +1,4 @@
-namespace ShowWhatProcessLocksFile.LockingProcessesInfo.HandleExe
+namespace ShowWhatProcessLocksFile.LockFinding.HandleExe
 {
     public enum HandleType
     {
diff --git a/src/App/LockFinding/LockFinder.cs b/src/App/LockFinding/LockFinder.cs
new file mode 100644
index 0000000..ebffb55
--- /dev/null
+++ b/src/App/LockFinding/LockFinder.cs
@@ -0,0 +1,112 @@
+using MoreLinq;
+using ShowWhatProcessLocksFile.LockFinding.HandleExe;
+using ShowWhatProcessLocksFile.Utils;
+using System;
+using System.Collections.Generic;
+using System.Diagnostics;
+using System.Drawing;
+using System.Linq;
+using System.Windows;
+using System.Windows.Interop;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+
+namespace ShowWhatProcessLocksFile.LockFinding
+{
+    public static class LockFinder
+    {
+        public static IEnumerable<ProcessInfo> FindWhatProcessesLockPath(string path)
+        {
+            var output = Handle.Execute(path);
+            var parsedHandleExeOutput = HandleOutputParser.Parse(output);
+
+            return parsedHandleExeOutput
+                // File path which we supply to Handle.exe is treated as "Show locks for all entities whose names start with this path".
+                // Which is not what we want, because if we ask to show what locks "C:\Program Files" folder,
+                // it will also show processes which lock "C:\Program Files (x86)" folder.
+                // Therefore, we need to manually filter out this extra information.
+                .Where(p => string.Equals(p.FileFullName, path, StringComparison.OrdinalIgnoreCase)
+                            || PathUtils.IsInsideFolder(p.FileFullName, path)
+                            // If the path contains cyrillic letters, Handle.exe replaces them with '?'.
+                            // For example if something locks "C:\файл.txt" the Handle.exe will print "C:\????.txt" as the name of the file.
+                            // However, the first condition "string.Equals(p.FileFullName, ...)" will filter such lines out.
+                            // Therefore, regardless if this file is locked or not, our app will show that nothing locks this file.
+                            || p.FileFullName.Contains('?'))
+                // Handle.exe produces non grouped output. We need to group all locked handles per process.
+                .GroupBy(el => el.Pid)
+                // There can be several records corresponding to the same file locked by the same process but with a different 'HandleCode'.
+                // We don't use 'HandleCode' field and want to leave only one of these records to avoid showing the user that the same file is locked twice.
+                .Select(el => el.DistinctBy(e => e.FileFullName))
+                .Select(el => CreateProcessInfo(el))
+                // Remove all elements for which 'CreateProcessInfo' has failed to extract process information
+                .Where(el => el != null)
+                .OrderBy(el => el.Name);
+        }
+
+        private static ProcessInfo CreateProcessInfo(IEnumerable<HandleParsedLine> handleExeParsedLinesForTheSameProcess)
+        {
+            try
+            {
+                var handle = handleExeParsedLinesForTheSameProcess.First();
+                var pid = handle.Pid;
+                var processName = handle.ProcessName;
+                var process = Process.GetProcessById(pid);
+                // There are processes for which it is not possible to get full name and icon.
+                // One of such processes is "System"
+                var processFullName = TryGetProcessFullName(process);
+                var processIcon = TryGetIcon(processFullName);
+
+                return new ProcessInfo(
+                    pid: pid,
+                    processName: processName,
+                    executableFullName: processFullName,
+                    process: process,
+                    icon: processIcon,
+                    userName: handle.UserName,
+                    lockedFiles: handleExeParsedLinesForTheSameProcess.Select(l => l.FileFullName).OrderBy(x => x));
+            }
+            catch (Exception ex)
+            {
+                Log.Warn($"Failed to create a process info from: '{handleExeParsedLinesForTheSameProcess.FirstOrDefault()}'. Exception:\n{ex}");
+                return null;
+            }
+        }
+
+        private static string TryGetProcessFullName(Process process)
+        {
+            try
+            {
+                return process.MainModule.FileName;
+            }
+            catch (Exception ex)
+            {
+                Log.Warn($"Failed to get a full name of a process: name='{process.ProcessName}' pid='{process.Id}'. Exception:\n{ex}");
+                return null;
+            }
+        }
+
+        private static ImageSource TryGetIcon(string executableFullName)
+        {
+            if (executableFullName == null)
+            {
+                return null;
+            }
+
+            try
+            {
+                using (var ico = Icon.ExtractAssociatedIcon(executableFullName))
+                {
+                    var image = Imaging.CreateBitmapSourceFromHIcon(ico.Handle, Int32Rect.Empty, BitmapSizeOptions.FromEmptyOptions());
+                    // We need to freeze the image, otherwise the GUI thread will not be able to use it if this function was called from another process
+                    image.Freeze();
+                    return image;
+                }
+            }
+            catch (Exception ex)
+            {
+                Log.Warn($"Failed to get an icon from executable '{executableFullName}'. Exception:\n{ex}");
+                return null;
+            }
+        }
+    }
+}
diff --git a/src/App/LockingProcessesInfo/ProcessInfo.cs b/src/App/LockFinding/ProcessInfo.cs
similarity index 93%
rename from src/App/LockingProcessesInfo/ProcessInfo.cs
rename to src/App/LockFinding/ProcessInfo.cs
index 85f3ff1..a388116 100644
--- a/src/App/LockingProcessesInfo/ProcessInfo.cs
+++ b/src/App/LockFinding/ProcessInfo.cs
@@ -3,7 +3,7 @@
 using System.Diagnostics;
 using System.Windows.Media;
 
-namespace ShowWhatProcessLocksFile.LockingProcessesInfo
+namespace ShowWhatProcessLocksFile.LockFinding
 {
     public class ProcessInfo
     {
diff --git a/src/App/LockingProcessesInfo/HandleExe/Handle.cs b/src/App/LockingProcessesInfo/HandleExe/Handle.cs
deleted file mode 100644
index 7b2ba02..0000000
--- a/src/App/LockingProcessesInfo/HandleExe/Handle.cs
+++ /dev/null
@@ -1,21 +0,0 @@
-using System;
-using System.IO;
-
-namespace ShowWhatProcessLocksFile.LockingProcessesInfo.HandleExe
-{
-    public static class Handle
-    {
-        private static readonly string FullName = Path.Combine(AppContext.BaseDirectory, "handle.exe");
-
-        public static string Execute(string fileFullName)
-        {
-            // Handle.exe doesn't work if a path contains "\" character at the end
-            if (fileFullName.EndsWith(@"\"))
-            {
-                fileFullName = fileFullName.Remove(fileFullName.Length - 1);
-            }
-
-            return CommandLine.Execute(FullName, $"-u -nobanner -accepteula \"{fileFullName}\"");
-        }
-    }
-}
diff --git a/src/App/LockingProcessesInfo/ProcessesInfoRetriever.cs b/src/App/LockingProcessesInfo/ProcessesInfoRetriever.cs
deleted file mode 100644
index 0b27cec..0000000
--- a/src/App/LockingProcessesInfo/ProcessesInfoRetriever.cs
+++ /dev/null
@@ -1,68 +0,0 @@
-using MoreLinq;
-using ShowWhatProcessLocksFile.LockingProcessesInfo.HandleExe;
-using ShowWhatProcessLocksFile.Utils;
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Drawing;
-using System.Linq;
-using System.Windows;
-using System.Windows.Interop;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
-
-namespace ShowWhatProcessLocksFile.LockingProcessesInfo
-{
-    public static class ProcessesInfoRetriever
-    {
-        public static IEnumerable<ProcessInfo> GetProcessesInfo(string fileFullName)
-        {
-            var output = Handle.Execute(fileFullName);
-            var parsedHandleExeOutput = HandleOutputParser.Parse(output);
-
-            // Handle.exe produces non grouped output. We need to group all locked handles per process.
-            var groupedByPid = parsedHandleExeOutput.GroupBy(el => el.Pid);
-
-            // There can be several records corresponding to the same file locked by the same process but with a different 'HandleCode'.
-            // We don't care about the 'HandleCode' and therefore want to leave only one of these records to avoid showing the user that the same file is locked twice.
-            var groupedByPidWithoutDiplicateFileNames = groupedByPid.Select(el => el.DistinctBy(e => e.FileFullName));
-
-            return groupedByPidWithoutDiplicateFileNames.Select(el => CreateProcessInfo(el)).Where(el => el != null);
-        }
-
-        private static ProcessInfo CreateProcessInfo(IEnumerable<HandleParsedLine> handleExeParsedLinesForTheSameProcess)
-        {
-            try
-            {
-                var handle = handleExeParsedLinesForTheSameProcess.First();
-                var pid = handle.Pid;
-                var processName = handle.ProcessName;
-                var process = Process.GetProcessById(pid);
-                var processFullName = process.MainModule.FileName;
-                var processIcon = GetProcessIcon(processFullName);
-
-                return new ProcessInfo(
-                    pid: pid,
-                    processName: processName,
-                    executableFullName: processFullName,
-                    process: process,
-                    icon: processIcon,
-                    userName: handle.UserName,
-                    lockedFiles: handleExeParsedLinesForTheSameProcess.Select(l => l.FileFullName).OrderBy(x => x));
-            }
-            catch (Exception ex)
-            {
-                Log.Warn($"Failed to create a process info from: '{handleExeParsedLinesForTheSameProcess.FirstOrDefault()}'. Exception:\n{ex}");
-                return null;
-            }
-        }
-
-        private static ImageSource GetProcessIcon(string executableFullName)
-        {
-            using (var ico = Icon.ExtractAssociatedIcon(executableFullName))
-            {
-                return Imaging.CreateBitmapSourceFromHIcon(ico.Handle, Int32Rect.Empty, BitmapSizeOptions.FromEmptyOptions());
-            }
-        }
-    }
-}
diff --git a/src/App/ShowWhatProcessLocksFile.csproj b/src/App/ShowWhatProcessLocksFile.csproj
index ae38627..c741c32 100644
--- a/src/App/ShowWhatProcessLocksFile.csproj
+++ b/src/App/ShowWhatProcessLocksFile.csproj
@@ -3,42 +3,33 @@
     <OutputType>WinExe</OutputType>
     <TargetFramework>net461</TargetFramework>
     <UseWPF>true</UseWPF>
-    <Platforms>x64</Platforms>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PlatformTarget>x64</PlatformTarget>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PlatformTarget>x64</PlatformTarget>
+    <ApplicationIcon>Icon\icon.ico</ApplicationIcon>
   </PropertyGroup>
     
   <ItemGroup>
-    <PackageReference Include="CliWrap" Version="3.3.2" />
+    <PackageReference Include="CliWrap" Version="3.3.3" />
     <PackageReference Include="morelinq" Version="3.3.2" />
+    <PackageReference Include="SharpVectors" Version="1.7.6" />
   </ItemGroup>
 
   <ItemGroup>
-    <Resource Include="Gui\Icons\Checkmark_16x.png" />
-    <Resource Include="Gui\Icons\CollapseAll_16x.png" />
-    <Resource Include="Gui\Icons\ExpandAll_16x.png" />
-    <Resource Include="Gui\Icons\ExpandDown_md_16x.png" />
-    <Resource Include="Gui\Icons\ExpandRight_md_16x.png" />
-    <Resource Include="Gui\Icons\Refresh_16x.png" />
-    <Resource Include="Gui\Icons\StatusCriticalError_16x.png" />
+    <Resource Include="Gui\Icons\Checkmark_16x.svg" />
+    <Resource Include="Gui\Icons\CollapseAll_16x.svg" />
+    <Resource Include="Gui\Icons\ExpandAll_16x.svg" />
+    <Resource Include="Gui\Icons\ExpandDown_md_16x.svg" />
+    <Resource Include="Gui\Icons\ExpandRight_md_16x.svg" />
+    <Resource Include="Gui\Icons\Refresh_16x.svg" />
+    <Resource Include="Gui\Icons\StatusCriticalError_16x.svg" />
   </ItemGroup>
 
   <!-- Download handle.exe and unpack it -->
   <Target Name="DownloadHandleExe" BeforeTargets="BeforeBuild" Condition="!Exists('$(BuildFolder)handle.zip')">
-    <Message Text="Download handle from the web"/>
-    <Exec Command="PowerShell -NonInteractive -ExecutionPolicy Unrestricted -Command ^
-      &quot; Invoke-WebRequest -Uri https://download.sysinternals.com/files/Handle.zip -OutFile '$(BuildFolder)handle.zip' &quot;" />
+    <Message Text="Download handle from the web" />
+    <Exec Command="PowerShell -NonInteractive -ExecutionPolicy Unrestricted -Command ^&#xA;      &quot; Invoke-WebRequest -Uri https://download.sysinternals.com/files/Handle.zip -OutFile '$(BuildFolder)handle.zip' &quot;" />
   </Target>
   <Target Name="UnpackHandleExe" AfterTargets="DownloadHandleExe" BeforeTargets="BeforeBuild" Condition="!Exists('$(OutDir)handle.exe')">
-    <Message Text="Unpack handle.zip"/>
-    <Exec Command="PowerShell -NonInteractive -ExecutionPolicy Unrestricted -Command ^
-      &quot; Expand-Archive '$(BuildFolder)handle.zip' '$(OutDir)' &quot;" />
+    <Message Text="Unpack handle.zip" />
+    <Exec Command="PowerShell -NonInteractive -ExecutionPolicy Unrestricted -Command ^&#xA;      &quot; Expand-Archive '$(BuildFolder)handle.zip' '$(OutDir)' &quot;" />
   </Target>
 </Project>
diff --git a/src/App/Utils/CommandLineParser.cs b/src/App/Utils/CommandLineParser.cs
index 07213e9..33c4a41 100644
--- a/src/App/Utils/CommandLineParser.cs
+++ b/src/App/Utils/CommandLineParser.cs
@@ -7,7 +7,7 @@ internal static class CommandLineParser
     {
         public static string GetFileFullName()
         {
-            string[] args = Environment.GetCommandLineArgs();
+            var args = Environment.GetCommandLineArgs();
 
             if (args.Length == 1)
             {
diff --git a/src/App/Utils/PathUtils.cs b/src/App/Utils/PathUtils.cs
new file mode 100644
index 0000000..eba2cf6
--- /dev/null
+++ b/src/App/Utils/PathUtils.cs
@@ -0,0 +1,17 @@
+using System;
+
+namespace ShowWhatProcessLocksFile.Utils
+{
+    public static class PathUtils
+    {
+        public static string RemoveTrailingPathSeparator(string path)
+        {
+            return path.TrimEnd(new char[] { '\\' });
+        }
+
+        public static bool IsInsideFolder(string path, string folder)
+        {
+            return path.StartsWith($@"{RemoveTrailingPathSeparator(folder)}\", StringComparison.InvariantCultureIgnoreCase);
+        }
+    }
+}
diff --git a/src/App/Utils/ProcessKiller.cs b/src/App/Utils/ProcessKiller.cs
index 67f6948..9c0a8cd 100644
--- a/src/App/Utils/ProcessKiller.cs
+++ b/src/App/Utils/ProcessKiller.cs
@@ -1,4 +1,4 @@
-using ShowWhatProcessLocksFile.LockingProcessesInfo;
+using ShowWhatProcessLocksFile.LockFinding;
 using System;
 using System.Collections.Generic;
 
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 242ce1b..c12eb52 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -4,6 +4,7 @@
         <BuildFolder>$(ProjectRoot)build\</BuildFolder>
         <OutputPath>$(BuildFolder)$(Configuration)</OutputPath>
         <BaseIntermediateOutputPath>$(BuildFolder)obj\$(MSBuildProjectName)\</BaseIntermediateOutputPath>
+        <Platforms>x64</Platforms>
         <WarningLevel>5</WarningLevel>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <Version>0.0-dev</Version>
diff --git a/src/Installer/Installer.wixproj b/src/Installer/Installer.wixproj
index f38b0e2..373ab1d 100644
--- a/src/Installer/Installer.wixproj
+++ b/src/Installer/Installer.wixproj
@@ -7,6 +7,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <OutputName>ShowWhatProcessLocksFile</OutputName>
     <OutputType>Package</OutputType>
+    <SuppressValidation>True</SuppressValidation>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x64' ">
     <DefineConstants>Debug</DefineConstants>
diff --git a/src/Installer/Product.wxs b/src/Installer/Product.wxs
index e8c0821..61d92f2 100644
--- a/src/Installer/Product.wxs
+++ b/src/Installer/Product.wxs
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
   <Product Id="*" Name="ShowWhatProcessLocksFile" Language="1033" Version="$(var.InstallerVersion)" Manufacturer="PolarGoose" UpgradeCode="ecbb21bf-5b26-4971-aac2-d3528a7f10fb">
-    <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
+    <Package InstallerVersion="200" Compressed="yes" InstallScope="perUser" InstallPrivileges="limited" />
 
-    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+    <MajorUpgrade AllowSameVersionUpgrades="yes" DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
     <MediaTemplate EmbedCab="yes" />
 
     <Feature Id="ProductFeature" Title="ShowWhatProcessLocksFile" Level="1">
@@ -13,7 +13,7 @@
 
   <Fragment>
     <Directory Id="TARGETDIR" Name="SourceDir">
-      <Directory Id="ProgramFiles64Folder">
+      <Directory Id="AppDataFolder">
         <Directory Id="INSTALLFOLDER" Name="ShowWhatProcessLocksFile" />
       </Directory>
     </Directory>
@@ -26,27 +26,38 @@
         <File Source="$(var.TargetDir)net461\ShowWhatProcessLocksFile.exe.config" />
         <File Source="$(var.TargetDir)net461\handle.exe" />
         <File Source="$(var.TargetDir)net461\CliWrap.dll" />
+        <File Source="$(var.TargetDir)net461\SharpVectors.Converters.Wpf.dll" />
+        <File Source="$(var.TargetDir)net461\SharpVectors.Rendering.Gdi.dll" />
+        <File Source="$(var.TargetDir)net461\SharpVectors.Rendering.Wpf.dll" />
+        <File Source="$(var.TargetDir)net461\SharpVectors.Model.dll" />
+        <File Source="$(var.TargetDir)net461\SharpVectors.Css.dll" />
+        <File Source="$(var.TargetDir)net461\SharpVectors.Dom.dll" />
+        <File Source="$(var.TargetDir)net461\SharpVectors.Runtime.Wpf.dll" />
+        <File Source="$(var.TargetDir)net461\SharpVectors.Core.dll" />
         <File Source="$(var.TargetDir)net461\Microsoft.Bcl.AsyncInterfaces.dll" />
         <File Source="$(var.TargetDir)net461\System.Buffers.dll" />
-        <File Source="$(var.TargetDir)net461\System.Runtime.CompilerServices.Unsafe.dll" />
-        <File Source="$(var.TargetDir)net461\System.Runtime.InteropServices.RuntimeInformation.dll" />
         <File Source="$(var.TargetDir)net461\System.Threading.Tasks.Extensions.dll" />
-        <File Source="$(var.TargetDir)net461\System.ValueTuple.dll" />
+        <File Source="$(var.TargetDir)net461\System.Runtime.CompilerServices.Unsafe.dll" />
         <File Source="$(var.TargetDir)net461\MoreLinq.dll" />
+        <File Source="$(var.TargetDir)net461\System.ValueTuple.dll" />
+        <File Source="$(var.TargetDir)net461\System.Runtime.InteropServices.RuntimeInformation.dll" />
 
-        <RegistryKey Root="HKCR"
-                     Key="*\shell\ShowWhatProcessLocksFile">
+        <!-- https://stackoverflow.com/a/29769228/7585517 -->
+        <RegistryKey Root="HKCU"
+                     Key="Software\Classes\*\shell\ShowWhatProcessLocksFile">
           <RegistryValue Type="string" Value="Show what locks this file" />
+          <RegistryValue Type="string" Name="Icon" Value="&quot;[INSTALLFOLDER]ShowWhatProcessLocksFile.exe&quot;" />
           <RegistryKey Key="command">
-              <RegistryValue Type="string" Value="&quot;C:\Program Files\ShowWhatProcessLocksFile\ShowWhatProcessLocksFile.exe&quot; &quot;%1&quot;" />
+              <RegistryValue Type="string" Value="&quot;[INSTALLFOLDER]ShowWhatProcessLocksFile.exe&quot; &quot;%1&quot;" />
           </RegistryKey>
         </RegistryKey>
 
-        <RegistryKey Root="HKCR"
-                     Key="Directory\shell\ShowWhatProcessLocksFile">
+        <RegistryKey Root="HKCU"
+                     Key="Software\Classes\Directory\shell\ShowWhatProcessLocksFile">
           <RegistryValue Type="string" Value="Show what locks this folder" />
+          <RegistryValue Type="string" Name="Icon" Value="&quot;[INSTALLFOLDER]ShowWhatProcessLocksFile.exe&quot;" />
           <RegistryKey Key="command">
-              <RegistryValue Type="string" Value="&quot;C:\Program Files\ShowWhatProcessLocksFile\ShowWhatProcessLocksFile.exe&quot; &quot;%1&quot;" />
+              <RegistryValue Type="string" Value="&quot;[INSTALLFOLDER]ShowWhatProcessLocksFile.exe&quot; &quot;%1&quot;" />
           </RegistryKey>
         </RegistryKey>
       </Component>
diff --git a/src/Test/Test.csproj b/src/Test/Test.csproj
index 96d19a6..1ad19a8 100644
--- a/src/Test/Test.csproj
+++ b/src/Test/Test.csproj
@@ -2,24 +2,12 @@
 
   <PropertyGroup>
     <TargetFramework>net461</TargetFramework>
-
-    <IsPackable>false</IsPackable>
-
-    <Platforms>x64</Platforms>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-    <PlatformTarget>x64</PlatformTarget>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
-    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="NUnit" Version="3.13.2" />
-    <PackageReference Include="NUnit.ConsoleRunner" Version="3.12.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
+    <PackageReference Include="NUnit.ConsoleRunner" Version="3.13.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.1.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Test/TestData/HandleExeOutput_nothingFound.txt b/src/Test/TestData/HandleExeOutput_nothingFound.txt
index df8e482..6836e3e 100644
--- a/src/Test/TestData/HandleExeOutput_nothingFound.txt
+++ b/src/Test/TestData/HandleExeOutput_nothingFound.txt
@@ -1 +1 @@
-No matching handles found.

+No matching handles found.
diff --git a/src/Test/TestHandleOutputParser.cs b/src/Test/TestHandleOutputParser.cs
index 96719e1..03e2be5 100644
--- a/src/Test/TestHandleOutputParser.cs
+++ b/src/Test/TestHandleOutputParser.cs
@@ -1,5 +1,5 @@
 using NUnit.Framework;
-using ShowWhatProcessLocksFile.LockingProcessesInfo.HandleExe;
+using ShowWhatProcessLocksFile.LockFinding.HandleExe;
 using System;
 using System.IO;
 using System.Linq;
diff --git a/src/Test/TestLockFinder.cs b/src/Test/TestLockFinder.cs
new file mode 100644
index 0000000..635a71d
--- /dev/null
+++ b/src/Test/TestLockFinder.cs
@@ -0,0 +1,52 @@
+using NUnit.Framework;
+using ShowWhatProcessLocksFile.LockFinding;
+using ShowWhatProcessLocksFile.Utils;
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Test
+{
+    [TestFixture]
+    public class TestLockFinder
+    {
+        [TestCase(@"C:\Program Files")]
+        [TestCase(@"C:\Program Files\")]
+        public void Retrieve_locking_info_for_ProgramFiles_locked_folder(string path)
+        {
+            var processes = LockFinder.FindWhatProcessesLockPath(path);
+            AssertThatContainsExplorerProcess(processes);
+            AssertThatDoesntContainProcessesLockingDifferentPath(processes, path);
+        }
+
+        [TestCase(@"C:")]
+        [TestCase(@"C:\")]
+        public void Retrieve_locking_info_for_disk_C(string path)
+        {
+            var processes = LockFinder.FindWhatProcessesLockPath(path);
+            AssertThatContainsExplorerProcess(processes);
+        }
+
+        [TestCase(@"C:\nonExistingFolder")]
+        [TestCase(@"C:\nonExistingFolder\")]
+        public void Retrieves_nothing_for_folder_which_is_not_locked(string path)
+        {
+            var processes = LockFinder.FindWhatProcessesLockPath(@"C:\nonExistingFolder\");
+            Assert.IsEmpty(processes);
+        }
+
+        private void AssertThatContainsExplorerProcess(IEnumerable<ProcessInfo> lockingProcesses)
+        {
+            var explorerProcesses = lockingProcesses.Where(p => p.Name == "explorer.exe").ToList();
+            Assert.GreaterOrEqual(explorerProcesses.Count, 1);
+            Assert.IsNotEmpty(explorerProcesses[0].ExecutableFullName);
+            Assert.IsNotNull(explorerProcesses[0].Icon);
+        }
+
+        private void AssertThatDoesntContainProcessesLockingDifferentPath(IEnumerable<ProcessInfo> lockingProcesses, string requestedPath)
+        {
+            var otherProcesses = lockingProcesses.Where(p => p.LockedFiles.All(file => !PathUtils.IsInsideFolder(file, requestedPath)));
+            Assert.IsEmpty(otherProcesses,
+                           "The locking information should only contain information about processes locking a requested path, not some other pathes");
+        }
+    }
+}
diff --git a/src/Test/TestsIntegration.cs b/src/Test/TestsIntegration.cs
deleted file mode 100644
index 1dc7d36..0000000
--- a/src/Test/TestsIntegration.cs
+++ /dev/null
@@ -1,37 +0,0 @@
-using NUnit.Framework;
-using ShowWhatProcessLocksFile.LockingProcessesInfo;
-using System.Linq;
-
-namespace Test
-{
-    [TestFixture]
-    public class TestsIntegration
-    {
-        [Test]
-        public void Retrieve_locking_info_for_ProgramFiles()
-        {
-            var processes = ProcessesInfoRetriever.GetProcessesInfo(@"C:\Program Files\");
-            var explorerProcesses = processes.Where(p => p.Name == "explorer.exe").ToList();
-            Assert.GreaterOrEqual(explorerProcesses.Count, 1);
-            Assert.IsNotEmpty(explorerProcesses[0].ExecutableFullName);
-            Assert.IsNotNull(explorerProcesses[0].Icon);
-        }
-
-        [Test]
-        public void Retrieve_locking_info_for_C_drive()
-        {
-            var processes = ProcessesInfoRetriever.GetProcessesInfo(@"C:\");
-            var explorerProcesses = processes.Where(p => p.Name == "explorer.exe").ToList();
-            Assert.GreaterOrEqual(explorerProcesses.Count, 1);
-            Assert.IsNotEmpty(explorerProcesses[0].ExecutableFullName);
-            Assert.IsNotNull(explorerProcesses[0].Icon);
-        }
-
-        [Test]
-        public void Retrieves_nothing_for_folder_which_is_not_locked()
-        {
-            var processes = ProcessesInfoRetriever.GetProcessesInfo(@"C:\nonExistingFolder");
-            Assert.IsEmpty(processes);
-        }
-    }
-}