diff --git a/AltCover.Avalonia/AltCover.MainWindow.xaml b/AltCover.Avalonia/AltCover.MainWindow.xaml
index 2d3a65bf5..5e27d3743 100644
--- a/AltCover.Avalonia/AltCover.MainWindow.xaml
+++ b/AltCover.Avalonia/AltCover.MainWindow.xaml
@@ -25,7 +25,7 @@
         <MenuItem Name="List" IsEnabled="False">
           <MenuItem.Header>
             <StackPanel>
-              <Image Name="ListImage" Source="resm:AltCover.UICommon.ExpandDown_lightGray.png?assembly=AltCover.UICommon" Stretch="None" Margin="0,8" />
+              <Image Name="ListImage" Source="resm:AltCover.UICommon.ExpandDown_lightGrey.png?assembly=AltCover.UICommon" Stretch="None" Margin="0,8" />
             </StackPanel>
           </MenuItem.Header>
           <MenuItem Header="0"></MenuItem>
diff --git a/AltCover.Tests/ShowGeneratedRunLatest.xml b/AltCover.Tests/ShowGeneratedRunLatest.xml
new file mode 100644
index 000000000..f587d5b42
--- /dev/null
+++ b/AltCover.Tests/ShowGeneratedRunLatest.xml
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8" standalone="yes"?>
+<?xml-stylesheet type="text/xsl" href="coverage.xsl" ?>
+<coverage profilerVersion="AltCover 7.1.7494.18954" driverVersion="AltCover.Recorder 7.1.7494.18954" startTime="2020-07-08T15:59:02.5945144Z" measureTime="2020-07-08T15:59:02.5945163Z">
+  <module moduleId="e45f04b4-9ef2-5cde-9f2d-7439027eaa3b" name="C:\Users\steve\Documents\GitHub\altcover\_Binaries\Samples\Sample4\Debug+AnyCPU\netcoreapp2.1\Samples\Sample4.dll" assembly="Samples\Sample4" assemblyIdentity="Samples\Sample4, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null" excluded="false">
+    <method name="main" class="Tests.Program" metadataToken="100663297" excluded="false" instrumented="true" fullname="System.Int32 Tests.Program.main(System.String[])">
+      <seqpnt visitcount="0" line="63" column="16" endline="63" endcolumn="17" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+    </method>
+    <method name="returnFoo" class="Tests.DU" metadataToken="100663298" excluded="false" instrumented="true" fullname="Tests.DU+MyUnion Tests.DU.returnFoo(System.Int32)">
+      <seqpnt visitcount="1" line="51" column="21" endline="51" endcolumn="26" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+    </method>
+    <method name="returnBar" class="Tests.DU" metadataToken="100663299" excluded="false" instrumented="true" fullname="Tests.DU+MyUnion Tests.DU.returnBar(System.String)">
+      <seqpnt visitcount="1" line="52" column="21" endline="52" endcolumn="26" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+    </method>
+    <method name="testMakeUnion" class="Tests.DU" metadataToken="100663300" excluded="false" instrumented="true" fullname="System.Void Tests.DU.testMakeUnion()">
+      <seqpnt visitcount="1" line="56" column="5" endline="56" endcolumn="37" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+      <seqpnt visitcount="-2" line="56" column="5" endline="56" endcolumn="9" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+      <seqpnt visitcount="1" line="57" column="5" endline="57" endcolumn="39" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+      <seqpnt visitcount="-2" line="57" column="5" endline="57" endcolumn="9" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+      <seqpnt visitcount="1" line="58" column="5" endline="58" endcolumn="44" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+      <seqpnt visitcount="-2" line="58" column="5" endline="58" endcolumn="9" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+    </method>
+    <method name="CompareTo" class="Tests.DU+MyUnion" metadataToken="100663314" excluded="false" instrumented="true" fullname="System.Int32 Tests.DU+MyUnion.CompareTo(System.Object)">
+      <seqpnt visitcount="-3" line="29" column="8" endline="29" endcolumn="15" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+    </method>
+    <method name="CompareTo" class="Tests.DU+MyUnion" metadataToken="100663315" excluded="false" instrumented="true" fullname="System.Int32 Tests.DU+MyUnion.CompareTo(System.Object,System.Collections.IComparer)">
+      <seqpnt visitcount="-3" line="29" column="8" endline="29" endcolumn="15" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+    </method>
+    <method name="GetHashCode" class="Tests.DU+MyUnion" metadataToken="100663317" excluded="false" instrumented="true" fullname="System.Int32 Tests.DU+MyUnion.GetHashCode()">
+      <seqpnt visitcount="-3" line="29" column="8" endline="29" endcolumn="15" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+    </method>
+    <method name="as_bar" class="Tests.DU+MyUnion" metadataToken="100663319" excluded="false" instrumented="true" fullname="Tests.DU+MyUnion Tests.DU+MyUnion.as_bar()">
+      <seqpnt visitcount="1" line="36" column="7" endline="36" endcolumn="10" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+      <seqpnt visitcount="1" line="37" column="9" endline="37" endcolumn="24" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+      <seqpnt visitcount="1" line="38" column="20" endline="38" endcolumn="33" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+      <seqpnt visitcount="0" line="39" column="20" endline="39" endcolumn="33" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+      <seqpnt visitcount="0" line="40" column="20" endline="40" endcolumn="33" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+      <seqpnt visitcount="0" line="42" column="16" endline="42" endcolumn="20" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+      <seqpnt visitcount="0" line="43" column="7" endline="43" endcolumn="11" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+      <seqpnt visitcount="0" line="44" column="14" endline="44" endcolumn="24" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+    </method>
+    <method name="get_MyBar" class="Tests.DU+MyUnion" metadataToken="100663320" excluded="false" instrumented="true" fullname="Microsoft.FSharp.Core.FSharpFunc`2 Tests.DU+MyUnion.get_MyBar()">
+      <seqpnt visitcount="0" line="46" column="25" endline="46" endcolumn="36" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+    </method>
+    <method name="Equals" class="Tests.DU+MyUnion" metadataToken="100663322" excluded="false" instrumented="true" fullname="System.Boolean Tests.DU+MyUnion.Equals(System.Object)">
+      <seqpnt visitcount="-3" line="29" column="8" endline="29" endcolumn="15" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+    </method>
+    <method name="Invoke" class="Tests.DU+get_MyBar@46" metadataToken="100663340" excluded="false" instrumented="true" fullname="Tests.DU+MyUnion Tests.DU+get_MyBar@44.Invoke(Microsoft.FSharp.Core.Unit)">
+      <seqpnt visitcount="0" line="46" column="25" endline="46" endcolumn="36" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+    </method>
+    <method name=".ctor" class="Tests.DU+MyClass" metadataToken="100663341" excluded="false" instrumented="true" fullname="System.Void Tests.DU+MyClass.#ctor()">
+      <seqpnt visitcount="0" line="49" column="27" endline="49" endcolumn="28" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+      <seqpnt visitcount="0" line="48" column="8" endline="48" endcolumn="15" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+    </method>
+    <method name="get_Property" class="Tests.DU+MyClass" metadataToken="100663342" excluded="false" instrumented="true" fullname="System.Int32 Tests.DU+MyClass.get_Property()">
+      <seqpnt visitcount="-3" line="49" column="16" endline="49" endcolumn="24" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+    </method>
+    <method name="set_Property" class="Tests.DU+MyClass" metadataToken="100663343" excluded="false" instrumented="true" fullname="System.Void Tests.DU+MyClass.set_Property(System.Int32)">
+      <seqpnt visitcount="-3" line="49" column="16" endline="49" endcolumn="24" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+    </method>
+    <method name="makeThing" class="Tests.M" metadataToken="100663344" excluded="false" instrumented="true" fullname="Tests.M+Thing Tests.M.makeThing(System.String)">
+      <seqpnt visitcount="2" line="21" column="21" endline="21" endcolumn="34" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+    </method>
+    <method name="testMakeThing" class="Tests.M" metadataToken="100663345" excluded="false" instrumented="true" fullname="System.Void Tests.M.testMakeThing()">
+      <seqpnt visitcount="1" line="25" column="5" endline="25" endcolumn="43" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+      <seqpnt visitcount="0" line="25" column="5" endline="25" endcolumn="9" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+      <seqpnt visitcount="1" line="26" column="5" endline="26" endcolumn="54" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+      <seqpnt visitcount="0" line="26" column="5" endline="26" endcolumn="9" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+    </method>
+    <method name="CompareTo" class="Tests.M+Thing" metadataToken="100663350" excluded="false" instrumented="true" fullname="System.Int32 Tests.M+Thing.CompareTo(System.Object)">
+      <seqpnt visitcount="-3" line="16" column="8" endline="16" endcolumn="13" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+    </method>
+    <method name="CompareTo" class="Tests.M+Thing" metadataToken="100663351" excluded="false" instrumented="true" fullname="System.Int32 Tests.M+Thing.CompareTo(System.Object,System.Collections.IComparer)">
+      <seqpnt visitcount="-3" line="16" column="8" endline="16" endcolumn="13" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+    </method>
+    <method name="GetHashCode" class="Tests.M+Thing" metadataToken="100663353" excluded="false" instrumented="true" fullname="System.Int32 Tests.M+Thing.GetHashCode()">
+      <seqpnt visitcount="-3" line="16" column="8" endline="16" endcolumn="13" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+    </method>
+    <method name="bytes" class="Tests.M+Thing" metadataToken="100663355" excluded="false" instrumented="true" fullname="System.Byte[] Tests.M+Thing.bytes()">
+      <seqpnt visitcount="1" line="18" column="27" endline="18" endcolumn="73" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+    </method>
+    <method name="Equals" class="Tests.M+Thing" metadataToken="100663357" excluded="false" instrumented="true" fullname="System.Boolean Tests.M+Thing.Equals(System.Object)">
+      <seqpnt visitcount="-3" line="16" column="8" endline="16" endcolumn="13" excluded="false" document="C:\Users\steve\Documents\GitHub\altcover\Samples\Sample4\Tests.fs" />
+    </method>
+  </module>
+</coverage>
\ No newline at end of file
diff --git a/AltCover.UICommon/AltCover.UICommon.fsproj b/AltCover.UICommon/AltCover.UICommon.fsproj
index b3cc22513..887daf9ad 100644
--- a/AltCover.UICommon/AltCover.UICommon.fsproj
+++ b/AltCover.UICommon/AltCover.UICommon.fsproj
@@ -47,9 +47,9 @@
     <EmbeddedResource Include="Property.png" />
     <EmbeddedResource Include="Refresh.png" />
     <EmbeddedResource Include="Refresh_greyThin.png" />
-    <EmbeddedResource Include="Report.png" />
-    <EmbeddedResource Include="ReportStale.png" />
-    <EmbeddedResource Include="ReportWarning.png" />
+    <EmbeddedResource Include="RawCodeCoverageDataFile.png" />
+    <EmbeddedResource Include="RawCodeCoverageDataFileStale.png" />
+    <EmbeddedResource Include="RawCodeCoverageDataFileWarning.png" />
     <EmbeddedResource Include="Resource.eo.resx" />
     <EmbeddedResource Include="Resource.resx" />
     <EmbeddedResource Include="StatusError.png" />
diff --git a/AltCover.UICommon/Assembly.png b/AltCover.UICommon/Assembly.png
index dce52a2ca..94d98842e 100644
Binary files a/AltCover.UICommon/Assembly.png and b/AltCover.UICommon/Assembly.png differ
diff --git a/AltCover.UICommon/Blank.png b/AltCover.UICommon/Blank.png
index 9bf60ade3..8e0b98042 100644
Binary files a/AltCover.UICommon/Blank.png and b/AltCover.UICommon/Blank.png differ
diff --git a/AltCover.UICommon/Class.png b/AltCover.UICommon/Class.png
index cd6d0f4bd..2ec5c5920 100644
Binary files a/AltCover.UICommon/Class.png and b/AltCover.UICommon/Class.png differ
diff --git a/AltCover.UICommon/Effect.png b/AltCover.UICommon/Effect.png
index da6b05b82..c47719ef7 100644
Binary files a/AltCover.UICommon/Effect.png and b/AltCover.UICommon/Effect.png differ
diff --git a/AltCover.UICommon/Exit.png b/AltCover.UICommon/Exit.png
index 67d11dd24..5b005668d 100644
Binary files a/AltCover.UICommon/Exit.png and b/AltCover.UICommon/Exit.png differ
diff --git a/AltCover.UICommon/ExpandDown.png b/AltCover.UICommon/ExpandDown.png
index b41ea26fc..ee0119278 100644
Binary files a/AltCover.UICommon/ExpandDown.png and b/AltCover.UICommon/ExpandDown.png differ
diff --git a/AltCover.UICommon/ExpandRight.png b/AltCover.UICommon/ExpandRight.png
index ac6c9eb90..21bc6726b 100644
Binary files a/AltCover.UICommon/ExpandRight.png and b/AltCover.UICommon/ExpandRight.png differ
diff --git a/AltCover.UICommon/Font.png b/AltCover.UICommon/Font.png
index 529103453..9f615b758 100644
Binary files a/AltCover.UICommon/Font.png and b/AltCover.UICommon/Font.png differ
diff --git a/AltCover.UICommon/Icons.fs b/AltCover.UICommon/Icons.fs
index f0044af7e..070a2754d 100644
--- a/AltCover.UICommon/Icons.fs
+++ b/AltCover.UICommon/Icons.fs
@@ -22,13 +22,13 @@ type Icons<'TIcon>(toIcon: System.IO.Stream -> 'TIcon) =
   //with
   //| x -> System.InvalidOperationException(name, x) |> raise
 
-  member self.Report = makeIcon "Report"
+  member self.Report = makeIcon "RawCodeCoverageDataFile"
 
   member self.ReportDated =
-    makeIcon "ReportStale"
+    makeIcon "RawCodeCoverageDataFileStale"
 
   member self.ReportWarning =
-    makeIcon "ReportWarning"
+    makeIcon "RawCodeCoverageDataFileWarning"
 
   member self.Assembly = makeIcon "Assembly"
   member self.Event = makeIcon "Event"
@@ -49,7 +49,7 @@ type Icons<'TIcon>(toIcon: System.IO.Stream -> 'TIcon) =
     makeIcon "MethodWarning"
 
   member self.MethodNoSource =
-    makeIcon "MissingMethod"
+    makeIcon "MethodMissing"
 
   member self.Branched =
     makeIcon "BranchFork_grn"
diff --git a/AltCover.UICommon/MethodMissing.png b/AltCover.UICommon/MethodMissing.png
index 1fbb7904f..50804e38b 100644
Binary files a/AltCover.UICommon/MethodMissing.png and b/AltCover.UICommon/MethodMissing.png differ
diff --git a/AltCover.UICommon/MissingFile.png b/AltCover.UICommon/MissingFile.png
index 6501833a0..9718b1901 100644
Binary files a/AltCover.UICommon/MissingFile.png and b/AltCover.UICommon/MissingFile.png differ
diff --git a/AltCover.UICommon/Module.png b/AltCover.UICommon/Module.png
index 2c00abbd3..367e97818 100644
Binary files a/AltCover.UICommon/Module.png and b/AltCover.UICommon/Module.png differ
diff --git a/AltCover.UICommon/Namespace.png b/AltCover.UICommon/Namespace.png
index bf16afb4e..aa8c42ff3 100644
Binary files a/AltCover.UICommon/Namespace.png and b/AltCover.UICommon/Namespace.png differ
diff --git a/AltCover.UICommon/OpenFile.png b/AltCover.UICommon/OpenFile.png
index e450d7b93..b23481407 100644
Binary files a/AltCover.UICommon/OpenFile.png and b/AltCover.UICommon/OpenFile.png differ
diff --git a/AltCover.UICommon/Property.png b/AltCover.UICommon/Property.png
index 5409edc0c..107da691d 100644
Binary files a/AltCover.UICommon/Property.png and b/AltCover.UICommon/Property.png differ
diff --git a/AltCover.UICommon/RawCodeCoverageDataFile.png b/AltCover.UICommon/RawCodeCoverageDataFile.png
new file mode 100644
index 000000000..c30445c0a
Binary files /dev/null and b/AltCover.UICommon/RawCodeCoverageDataFile.png differ
diff --git a/AltCover.UICommon/RawCodeCoverageDataFileStale.png b/AltCover.UICommon/RawCodeCoverageDataFileStale.png
new file mode 100644
index 000000000..ee74cfc8d
Binary files /dev/null and b/AltCover.UICommon/RawCodeCoverageDataFileStale.png differ
diff --git a/AltCover.UICommon/RawCodeCoverageDataFileWarning.png b/AltCover.UICommon/RawCodeCoverageDataFileWarning.png
new file mode 100644
index 000000000..18993f585
Binary files /dev/null and b/AltCover.UICommon/RawCodeCoverageDataFileWarning.png differ
diff --git a/AltCover.UICommon/Report.png b/AltCover.UICommon/Report.png
deleted file mode 100644
index d69c3faa9..000000000
Binary files a/AltCover.UICommon/Report.png and /dev/null differ
diff --git a/AltCover.UICommon/ReportStale.png b/AltCover.UICommon/ReportStale.png
deleted file mode 100644
index d89e857f2..000000000
Binary files a/AltCover.UICommon/ReportStale.png and /dev/null differ
diff --git a/AltCover.UICommon/ReportWarning.png b/AltCover.UICommon/ReportWarning.png
deleted file mode 100644
index 1e97d36ed..000000000
Binary files a/AltCover.UICommon/ReportWarning.png and /dev/null differ
diff --git a/AltCover.UICommon/StatusError.png b/AltCover.UICommon/StatusError.png
index 07329ed43..6254b19b9 100644
Binary files a/AltCover.UICommon/StatusError.png and b/AltCover.UICommon/StatusError.png differ
diff --git a/AltCover.UICommon/StatusError.svg b/AltCover.UICommon/StatusError.svg
index 62b75554f..904dc73f7 100644
--- a/AltCover.UICommon/StatusError.svg
+++ b/AltCover.UICommon/StatusError.svg
@@ -1,13 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-  <defs>
-    <style>.canvas{fill: none; opacity: 0;}.light-red{fill: #c50b17; opacity: 1;}.white{fill: #ffffff; opacity: 1;}</style>
-  </defs>
-  <title>StatusError</title>
-  <g id="canvas" class="canvas">
-    <path class="canvas" d="M16,16H0V0H16Z" />
-  </g>
-  <g id="level-1">
-    <path class="light-red" d="M14,7.5A6.5,6.5,0,1,1,7.5,1,6.508,6.508,0,0,1,14,7.5Z" />
-    <path class="white" d="M8.384,7.5l2.808,2.808-.884.884L7.5,8.384,4.692,11.192l-.884-.884L6.616,7.5,3.808,4.692l.884-.884L7.5,6.616l2.808-2.808.884.884Z" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.canvas{fill:none;opacity:0}.light-red,.white{fill:#c50b17;opacity:1}.white{fill:#fff}</style></defs><title>StatusError</title><g id="canvas" class="canvas"><path d="M16,16H0V0H16Z" class="canvas"/></g><g id="level-1"><path d="M14,7.5A6.5,6.5,0,1,1,7.5,1,6.508,6.508,0,0,1,14,7.5Z" class="light-red"/><path d="M8.384,7.5l2.808,2.808-.884.884L7.5,8.384,4.692,11.192l-.884-.884L6.616,7.5,3.808,4.692l.884-.884L7.5,6.616l2.808-2.808.884.884Z" class="white"/></g></svg>
\ No newline at end of file
diff --git a/AltCover.UICommon/StatusError_32.png b/AltCover.UICommon/StatusError_32.png
index 17ebfa8aa..816f43fb1 100644
Binary files a/AltCover.UICommon/StatusError_32.png and b/AltCover.UICommon/StatusError_32.png differ
diff --git a/AltCover.UICommon/StatusError_32.svg b/AltCover.UICommon/StatusError_32.svg
index ec77ffa46..7b07234fe 100644
--- a/AltCover.UICommon/StatusError_32.svg
+++ b/AltCover.UICommon/StatusError_32.svg
@@ -1,7 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="px" height="32px" viewBox="0 0 32 32" version="1.1">
-<g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(77.254902%,4.313725%,9.019608%);fill-opacity:1;" d="M 28 15 C 28 22.179688 22.179688 28 15 28 C 7.820312 28 2 22.179688 2 15 C 2 7.820312 7.820312 2 15 2 C 22.175781 2.007812 27.992188 7.824219 28 15 Z M 28 15 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 16.769531 15 L 22.382812 20.617188 L 20.617188 22.382812 L 15 16.769531 L 9.382812 22.382812 L 7.617188 20.617188 L 13.230469 15 L 7.617188 9.382812 L 9.382812 7.617188 L 15 13.230469 L 20.617188 7.617188 L 22.382812 9.382812 Z M 16.769531 15 "/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="px" height="32" version="1.1" viewBox="0 0 32 32"><g id="surface1"><path style="stroke:none;fill-rule:nonzero;fill:#c50b17;fill-opacity:1" d="M 28 15 C 28 22.179688 22.179688 28 15 28 C 7.820312 28 2 22.179688 2 15 C 2 7.820312 7.820312 2 15 2 C 22.175781 2.007812 27.992188 7.824219 28 15 Z M 28 15"/><path style="stroke:none;fill-rule:nonzero;fill:#fff;fill-opacity:1" d="M 16.769531 15 L 22.382812 20.617188 L 20.617188 22.382812 L 15 16.769531 L 9.382812 22.382812 L 7.617188 20.617188 L 13.230469 15 L 7.617188 9.382812 L 9.382812 7.617188 L 15 13.230469 L 20.617188 7.617188 L 22.382812 9.382812 Z M 16.769531 15"/></g></svg>
\ No newline at end of file
diff --git a/AltCover.UICommon/StatusInformation.png b/AltCover.UICommon/StatusInformation.png
index ba72b232e..2911c4ec1 100644
Binary files a/AltCover.UICommon/StatusInformation.png and b/AltCover.UICommon/StatusInformation.png differ
diff --git a/AltCover.UICommon/StatusInformation.svg b/AltCover.UICommon/StatusInformation.svg
index e832c98c5..988873adb 100644
--- a/AltCover.UICommon/StatusInformation.svg
+++ b/AltCover.UICommon/StatusInformation.svg
@@ -1,13 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-  <defs>
-    <style>.canvas{fill: none; opacity: 0;}.light-blue{fill: #005dba; opacity: 1;}.white{fill: #ffffff; opacity: 1;}</style>
-  </defs>
-  <title>StatusInformation</title>
-  <g id="canvas" class="canvas">
-    <path class="canvas" d="M16,16H0V0H16Z" />
-  </g>
-  <g id="level-1">
-    <path class="light-blue" d="M14,7.5A6.5,6.5,0,1,1,7.5,1,6.508,6.508,0,0,1,14,7.5Z" />
-    <path class="white" d="M8,11V6H7v5Zm.25-6.75A.75.75,0,1,1,7.5,3.5.75.75,0,0,1,8.25,4.25Z" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.canvas{fill:none;opacity:0}.light-blue,.white{fill:#005dba;opacity:1}.white{fill:#fff}</style></defs><title>StatusInformation</title><g id="canvas" class="canvas"><path d="M16,16H0V0H16Z" class="canvas"/></g><g id="level-1"><path d="M14,7.5A6.5,6.5,0,1,1,7.5,1,6.508,6.508,0,0,1,14,7.5Z" class="light-blue"/><path d="M8,11V6H7v5Zm.25-6.75A.75.75,0,1,1,7.5,3.5.75.75,0,0,1,8.25,4.25Z" class="white"/></g></svg>
\ No newline at end of file
diff --git a/AltCover.UICommon/StatusInformation_32.svg b/AltCover.UICommon/StatusInformation_32.svg
index 7eb61babe..e3abf3200 100644
--- a/AltCover.UICommon/StatusInformation_32.svg
+++ b/AltCover.UICommon/StatusInformation_32.svg
@@ -1,7 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="px" height="32px" viewBox="0 0 32 32" version="1.1">
-<g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(0%,36.470588%,72.941176%);fill-opacity:1;" d="M 28 15 C 28 22.179688 22.179688 28 15 28 C 7.820312 28 2 22.179688 2 15 C 2 7.820312 7.820312 2 15 2 C 22.175781 2.007812 27.992188 7.824219 28 15 Z M 28 15 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 16 22 L 16 12 L 14 12 L 14 22 Z M 16.5 8.5 C 16.5 9.328125 15.828125 10 15 10 C 14.171875 10 13.5 9.328125 13.5 8.5 C 13.5 7.671875 14.171875 7 15 7 C 15.828125 7 16.5 7.671875 16.5 8.5 Z M 16.5 8.5 "/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="px" height="32" version="1.1" viewBox="0 0 32 32"><g id="surface1"><path style="stroke:none;fill-rule:nonzero;fill:#005dba;fill-opacity:1" d="M 28 15 C 28 22.179688 22.179688 28 15 28 C 7.820312 28 2 22.179688 2 15 C 2 7.820312 7.820312 2 15 2 C 22.175781 2.007812 27.992188 7.824219 28 15 Z M 28 15"/><path style="stroke:none;fill-rule:nonzero;fill:#fff;fill-opacity:1" d="M 16 22 L 16 12 L 14 12 L 14 22 Z M 16.5 8.5 C 16.5 9.328125 15.828125 10 15 10 C 14.171875 10 13.5 9.328125 13.5 8.5 C 13.5 7.671875 14.171875 7 15 7 C 15.828125 7 16.5 7.671875 16.5 8.5 Z M 16.5 8.5"/></g></svg>
\ No newline at end of file
diff --git a/AltCover.UICommon/StatusWarning.svg b/AltCover.UICommon/StatusWarning.svg
index 9cb9047fd..f245724f2 100644
--- a/AltCover.UICommon/StatusWarning.svg
+++ b/AltCover.UICommon/StatusWarning.svg
@@ -1,13 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
-  <defs>
-    <style>.canvas{fill: none; opacity: 0;}.light-yellow{fill: #996f00; opacity: 1;}.white{fill: #ffffff; opacity: 1;}</style>
-  </defs>
-  <title>IconLightStatusWarning</title>
-  <g id="canvas" class="canvas">
-    <path class="canvas" d="M16,16H0V0H16Z" />
-  </g>
-  <g id="level-1">
-    <path class="light-yellow" d="M14.444,14.27,14,15H1l-.444-.73,6.5-12.5h.888Z" />
-    <path class="white" d="M7.5,13.25a.75.75,0,1,1,.75-.75A.75.75,0,0,1,7.5,13.25ZM7,6v4.5H8V6Z" />
-  </g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><defs><style>.canvas{fill:none;opacity:0}.light-yellow,.white{fill:#996f00;opacity:1}.white{fill:#fff}</style></defs><title>IconLightStatusWarning</title><g id="canvas" class="canvas"><path d="M16,16H0V0H16Z" class="canvas"/></g><g id="level-1"><path d="M14.444,14.27,14,15H1l-.444-.73,6.5-12.5h.888Z" class="light-yellow"/><path d="M7.5,13.25a.75.75,0,1,1,.75-.75A.75.75,0,0,1,7.5,13.25ZM7,6v4.5H8V6Z" class="white"/></g></svg>
\ No newline at end of file
diff --git a/AltCover.UICommon/StatusWarning_32.svg b/AltCover.UICommon/StatusWarning_32.svg
index f14e61e89..053f8848a 100644
--- a/AltCover.UICommon/StatusWarning_32.svg
+++ b/AltCover.UICommon/StatusWarning_32.svg
@@ -1,7 +1 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="px" height="32px" viewBox="0 0 32 32" version="1.1">
-<g id="surface1">
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(60%,43.529412%,0%);fill-opacity:1;" d="M 28.886719 28.539062 L 28 30 L 2 30 L 1.113281 28.539062 L 14.113281 3.539062 L 15.886719 3.539062 Z M 28.886719 28.539062 "/>
-<path style=" stroke:none;fill-rule:nonzero;fill:rgb(100%,100%,100%);fill-opacity:1;" d="M 15 26.5 C 14.171875 26.5 13.5 25.828125 13.5 25 C 13.5 24.171875 14.171875 23.5 15 23.5 C 15.828125 23.5 16.5 24.171875 16.5 25 C 16.5 25.828125 15.828125 26.5 15 26.5 Z M 14 12 L 14 21 L 16 21 L 16 12 Z M 14 12 "/>
-</g>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="px" height="32" version="1.1" viewBox="0 0 32 32"><g id="surface1"><path style="stroke:none;fill-rule:nonzero;fill:#996f00;fill-opacity:1" d="M 28.886719 28.539062 L 28 30 L 2 30 L 1.113281 28.539062 L 14.113281 3.539062 L 15.886719 3.539062 Z M 28.886719 28.539062"/><path style="stroke:none;fill-rule:nonzero;fill:#fff;fill-opacity:1" d="M 15 26.5 C 14.171875 26.5 13.5 25.828125 13.5 25 C 13.5 24.171875 14.171875 23.5 15 23.5 C 15.828125 23.5 16.5 24.171875 16.5 25 C 16.5 25.828125 15.828125 26.5 15 26.5 Z M 14 12 L 14 21 L 16 21 L 16 12 Z M 14 12"/></g></svg>
\ No newline at end of file
diff --git a/AltCover.UICommon/TextFile.png b/AltCover.UICommon/TextFile.png
index 975ac3c84..a3d596937 100644
Binary files a/AltCover.UICommon/TextFile.png and b/AltCover.UICommon/TextFile.png differ
diff --git a/AltCover.UICommon/VisualStudioToolsAboutBox.png b/AltCover.UICommon/VisualStudioToolsAboutBox.png
index b156c6e3f..365d9ed88 100644
Binary files a/AltCover.UICommon/VisualStudioToolsAboutBox.png and b/AltCover.UICommon/VisualStudioToolsAboutBox.png differ
diff --git a/AltCover.UICommon/Web.png b/AltCover.UICommon/Web.png
index b5a942746..4f2f8c7cd 100644
Binary files a/AltCover.UICommon/Web.png and b/AltCover.UICommon/Web.png differ
diff --git a/AltCover.UICommon/logo.png b/AltCover.UICommon/logo.png
index f94f235cc..8ccf4e486 100644
Binary files a/AltCover.UICommon/logo.png and b/AltCover.UICommon/logo.png differ
diff --git a/AltCover.Visualizer/Screenshot-Avalonia.png b/AltCover.Visualizer/Screenshot-Avalonia.png
index 972ca94b5..45c9df815 100644
Binary files a/AltCover.Visualizer/Screenshot-Avalonia.png and b/AltCover.Visualizer/Screenshot-Avalonia.png differ
diff --git a/AltCover.Visualizer/Screenshot-GTK.png b/AltCover.Visualizer/Screenshot-GTK.png
index eea4f55de..a790659cc 100644
Binary files a/AltCover.Visualizer/Screenshot-GTK.png and b/AltCover.Visualizer/Screenshot-GTK.png differ
diff --git a/AltCover.Visualizer/Screenshot-GTK3.png b/AltCover.Visualizer/Screenshot-GTK3.png
index 33e336fb2..0922c0a8e 100644
Binary files a/AltCover.Visualizer/Screenshot-GTK3.png and b/AltCover.Visualizer/Screenshot-GTK3.png differ
diff --git a/AltCover.Visualizer/Visualizer.fs b/AltCover.Visualizer/Visualizer.fs
index 54ba6c200..2c7b6cb20 100644
--- a/AltCover.Visualizer/Visualizer.fs
+++ b/AltCover.Visualizer/Visualizer.fs
@@ -183,63 +183,18 @@ module private Gui =
     seq { 0 .. (types.Length - 1) }
     |> Seq.iter (prepareTreeLine handler)
 
-    handler.classStructureTree.Model <-
-      new TreeStore(
 #if !VIS_PERCENT
-        typeof<string>,
-#endif
-        typeof<Gdk.Pixbuf>,
-        typeof<string>,
-#if VIS_PERCENT
-        typeof<string>,
-#endif
-        typeof<Gdk.Pixbuf>,
-        typeof<string>,
-#if VIS_PERCENT
-        typeof<string>,
-#endif
-        typeof<Gdk.Pixbuf>,
-        typeof<string>,
-#if VIS_PERCENT
-        typeof<string>,
-#endif
-        typeof<Gdk.Pixbuf>,
-        typeof<string>,
-#if VIS_PERCENT
-        typeof<string>
-#else
-        typeof<Gdk.Pixbuf>
-#endif
-      )
-
+    handler.classStructureTree.Model <-
+            new TreeStore(typeof<string>, typeof<Gdk.Pixbuf>, typeof<Gdk.Pixbuf>, typeof<string>,
+                          typeof<Gdk.Pixbuf>, typeof<string>, typeof<Gdk.Pixbuf>,
+                          typeof<string>, typeof<Gdk.Pixbuf>, typeof<string>,
+                          typeof<Gdk.Pixbuf>)
     handler.auxModel <-
-      new TreeStore(
-#if !VIS_PERCENT
-        typeof<string>,
-#endif
-        typeof<Gdk.Pixbuf>,
-        typeof<string>,
-#if VIS_PERCENT
-        typeof<string>,
-#endif
-        typeof<Gdk.Pixbuf>,
-        typeof<string>,
-#if VIS_PERCENT
-        typeof<string>,
+            new TreeStore(typeof<string>, typeof<Gdk.Pixbuf>, typeof<Gdk.Pixbuf>, typeof<string>,
+                          typeof<Gdk.Pixbuf>, typeof<string>, typeof<Gdk.Pixbuf>,
+                          typeof<string>, typeof<Gdk.Pixbuf>, typeof<string>,
+                          typeof<Gdk.Pixbuf>)
 #endif
-        typeof<Gdk.Pixbuf>,
-        typeof<string>,
-#if VIS_PERCENT
-        typeof<string>,
-#endif
-        typeof<Gdk.Pixbuf>,
-        typeof<string>,
-#if VIS_PERCENT
-        typeof<string>
-#else
-        typeof<Gdk.Pixbuf>
-#endif
-      )
 
 #if !NET472
   [<AutoSerializable(false); Sealed>]
@@ -408,7 +363,7 @@ module private Gui =
             table.Clear()
 
             let topRow =
-              model.AppendValues(name, pc, icon.Force())
+              model.AppendValues(name, (*pc,*) icon.Force()) // VIS_PERCENT
 
             if tip |> String.IsNullOrWhiteSpace |> not then
               let path = model.GetPath(topRow)
diff --git a/AltCover.Visualizer/images.txt b/AltCover.Visualizer/images.txt
new file mode 100644
index 000000000..2a93b086b
--- /dev/null
+++ b/AltCover.Visualizer/images.txt
@@ -0,0 +1,16 @@
+Screenshot-GTK.png -> README.core.md
+Screenshot-Avalonia -> README.visualizer.md
+Annotated.png
+Annotation66a.png
+FontSelection.png
+
+---
+TheVisualizer.md ->
+
+Screenshot-Avalonia
+Screenshot-GTK
+Annotated.png
+Annotation66a.png
+FontSelection.png -- 328x112
+Annotation66b.png
+Screenshot-GTK3
\ No newline at end of file
diff --git a/AltCover.Visualizer/wiki/Annotated.png b/AltCover.Visualizer/wiki/Annotated.png
new file mode 100644
index 000000000..c7ec3cc94
Binary files /dev/null and b/AltCover.Visualizer/wiki/Annotated.png differ
diff --git a/AltCover.Visualizer/wiki/Annotation66a.png b/AltCover.Visualizer/wiki/Annotation66a.png
new file mode 100644
index 000000000..943f4f2e1
Binary files /dev/null and b/AltCover.Visualizer/wiki/Annotation66a.png differ
diff --git a/AltCover.Visualizer/wiki/Annotation66b.png b/AltCover.Visualizer/wiki/Annotation66b.png
new file mode 100644
index 000000000..a3229acbf
Binary files /dev/null and b/AltCover.Visualizer/wiki/Annotation66b.png differ
diff --git a/AltCover.Visualizer/wiki/FontSelection.png b/AltCover.Visualizer/wiki/FontSelection.png
new file mode 100644
index 000000000..b946e6a32
Binary files /dev/null and b/AltCover.Visualizer/wiki/FontSelection.png differ
diff --git a/Build/AltCover_128.png b/Build/AltCover_128.png
index 4939e5398..58b747d83 100644
Binary files a/Build/AltCover_128.png and b/Build/AltCover_128.png differ
diff --git a/RegressionTesting/issue143/SaveContextToDatabaseStep-Coverage.png b/RegressionTesting/issue143/SaveContextToDatabaseStep-Coverage.png
index e2b056dbc..7e82ec590 100644
Binary files a/RegressionTesting/issue143/SaveContextToDatabaseStep-Coverage.png and b/RegressionTesting/issue143/SaveContextToDatabaseStep-Coverage.png differ
diff --git a/RegressionTesting/issue143/SupplementContextWithDatabaseRecordStep-Coverage.png b/RegressionTesting/issue143/SupplementContextWithDatabaseRecordStep-Coverage.png
index f368fe29a..9115c6243 100644
Binary files a/RegressionTesting/issue143/SupplementContextWithDatabaseRecordStep-Coverage.png and b/RegressionTesting/issue143/SupplementContextWithDatabaseRecordStep-Coverage.png differ
diff --git a/ReleaseNotes.md b/ReleaseNotes.md
index b484082ec..233cf7f88 100644
--- a/ReleaseNotes.md
+++ b/ReleaseNotes.md
@@ -2,6 +2,10 @@
 
 A. Start with the Quick Start guide : https://github.com/SteveGilham/altcover/wiki/QuickStart-Guide
 
+# 8.2.837 (Habu series release 13)
+* [VISUALIZER] Critical bug fixes for GTK and Avalonia : mismatched new icon names causing crashes
+* [VISUALIZER] Use new coverage data icon for the coverage report file, not a generic report icon
+
 # 8.2.836 (Habu series release 12)
 * [BUGFIX] Fix project file path handling in Cake support
 * [BUGFIX] Improve heuristic to recognise (and ignore)  state-machine injected branches in `async` methods; this may cause subtle changes, up or down, in branch detection for other generated code ("hidden" sequence points) contexts with branches