diff --git a/ILSpy/ILSpy.csproj b/ILSpy/ILSpy.csproj
index d8953ca45..f9d7a38eb 100644
--- a/ILSpy/ILSpy.csproj
+++ b/ILSpy/ILSpy.csproj
@@ -313,9 +313,12 @@
     <Page Include="CreateListDialog.xaml" />
     <Page Include="DebugSteps.xaml" />
     <Page Include="Images\Back.xaml" />
+    <Page Include="Images\Class.xaml" />
     <Page Include="Images\CollapseAll.xaml" />
     <Page Include="Images\Forward.xaml" />
     <Page Include="Images\Open.xaml" />
+    <Page Include="Images\OverlayInternal.xaml" />
+    <Page Include="Images\OverlayPrivate.xaml" />
     <Page Include="Images\Refresh.xaml" />
     <Page Include="Images\Search.xaml" />
     <Page Include="Images\Sort.xaml" />
@@ -395,10 +398,22 @@
 
   <ItemGroup>
     <Page Update="@(Page)" SubType="Designer" Generator="MSBuild:Compile" />
+    <Page Update="Images\Assembly.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Update="Images\AssemblyWarning.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Update="Images\Back.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Update="Images\Class.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Update="Images\CollapseAll.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -411,6 +426,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Update="Images\OverlayInternal.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Update="Images\OverlayPrivate.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Update="Images\Refresh.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
diff --git a/ILSpy/Images/Class.png b/ILSpy/Images/Class.png
index d62ac8b9d..91b35a829 100644
Binary files a/ILSpy/Images/Class.png and b/ILSpy/Images/Class.png differ
diff --git a/ILSpy/Images/Class.xaml b/ILSpy/Images/Class.xaml
new file mode 100644
index 000000000..465fa3ca4
--- /dev/null
+++ b/ILSpy/Images/Class.xaml
@@ -0,0 +1,9 @@
+<!-- This file was generated by the AiToXaml tool.-->
+<!-- Tool Version: 14.0.22307.0 -->
+<DrawingGroup xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+  <DrawingGroup.Children>
+    <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
+    <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M5.5863,-0.000199999999999534L0.000299999999999301,5.5858 0.000299999999999301,6.4138 3.9993,10.4138 6.4143,7.9998 7.0003,7.9998 7.0003,9.9998 7.0003,13.0008 8.5863,13.0008 11.5853,15.9998 12.4133,15.9998 16.0003,12.4148 16.0003,11.5858 13.9143,9.4998 16.0003,7.4138 16.0003,6.5858 12.9993,3.5868 11.5853,4.9998 10.0003,4.9998 9.4143,4.9998 10.4143,4.0008 6.4143,-0.000199999999999534z" />
+    <GeometryDrawing Brush="#FFC17C1A" Geometry="F1M13,10L15,12 12,15 10,13 11,12 8,12 8,7 6,7 4,9 1,6 6,1 9,4 7,6 12,6 13,5 15,7 12,10 10,8 11,7 9,7 9,11 11.999,11.002z" />
+  </DrawingGroup.Children>
+</DrawingGroup>
\ No newline at end of file
diff --git a/ILSpy/Images/Images.cs b/ILSpy/Images/Images.cs
index acac8a34c..fec60807b 100644
--- a/ILSpy/Images/Images.cs
+++ b/ILSpy/Images/Images.cs
@@ -107,12 +107,12 @@ namespace ICSharpCode.ILSpy
 
 		public static readonly BitmapImage Event = LoadBitmap("Event");
 
-		private static readonly BitmapImage OverlayProtected = LoadBitmap("OverlayProtected");
-		private static readonly BitmapImage OverlayInternal = LoadBitmap("OverlayInternal");
-		private static readonly BitmapImage OverlayProtectedInternal = LoadBitmap("OverlayProtectedInternal");
+		private static readonly object OverlayProtected = Load("OverlayProtected");
+		private static readonly object OverlayInternal = Load("OverlayInternal");
+		private static readonly object OverlayProtectedInternal = Load("OverlayProtectedInternal");
 		private static readonly object OverlayPrivate = Load("OverlayPrivate");
-		private static readonly BitmapImage OverlayPrivateProtected = LoadBitmap("OverlayPrivateProtected");
-		private static readonly BitmapImage OverlayCompilerControlled = LoadBitmap("OverlayCompilerControlled");
+		private static readonly object OverlayPrivateProtected = Load("OverlayPrivateProtected");
+		private static readonly object OverlayCompilerControlled = Load("OverlayCompilerControlled");
 
 		private static readonly object OverlayStatic = Load("OverlayStatic");
 
diff --git a/ILSpy/Images/OverlayInternal.png b/ILSpy/Images/OverlayInternal.png
index a58776cea..e6bbf2ef5 100644
Binary files a/ILSpy/Images/OverlayInternal.png and b/ILSpy/Images/OverlayInternal.png differ
diff --git a/ILSpy/Images/OverlayInternal.xaml b/ILSpy/Images/OverlayInternal.xaml
new file mode 100644
index 000000000..0547b6dca
Binary files /dev/null and b/ILSpy/Images/OverlayInternal.xaml differ
diff --git a/ILSpy/Images/OverlayPrivate.png b/ILSpy/Images/OverlayPrivate.png
index e33ec404e..605b509b2 100644
Binary files a/ILSpy/Images/OverlayPrivate.png and b/ILSpy/Images/OverlayPrivate.png differ
diff --git a/ILSpy/Images/OverlayPrivate.xaml b/ILSpy/Images/OverlayPrivate.xaml
new file mode 100644
index 000000000..8c3064fea
--- /dev/null
+++ b/ILSpy/Images/OverlayPrivate.xaml
@@ -0,0 +1,8 @@
+<DrawingGroup xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<DrawingGroup.Children>
+		<GeometryDrawing Brush="#00000000" Geometry="M16 16h-16v-16h16v16z" />
+		<GeometryDrawing Brush="#FFF6F6F6" Geometry="m 7 11 v 5 H 0 V 10.99501 H 0.1 C 0.2310581 9.8293885 0.2629692 8.007 3.422 8.007 L 3.594 8 c 2.78 0 3.21 1.827 3.329 3 z" />
+		<GeometryDrawing Brush="#FF424242" Geometry="M 1.018 11.531 C 1.148 10.406 1.198 9 3.594 9 c 2.227 0 2.285 1.412 2.37 2.531 H 4.998 C 4.984 10.785 4.843 9.99 3.594 9.99 2.353 9.99 2.078 10.802 2.019 11.531 Z M 6 12 v 3 H 1 V 12 Z M 4 13 H 3 v 1 h 1 z" />
+		<GeometryDrawing Brush="#FFF0EFF1" Geometry="m 3 13 h 1 v 1 H 3 Z" />
+	</DrawingGroup.Children>
+</DrawingGroup>
\ No newline at end of file
diff --git a/ILSpy/Images/OverlayProtected.png b/ILSpy/Images/OverlayProtected.png
index da9033d88..823c0b9b0 100644
Binary files a/ILSpy/Images/OverlayProtected.png and b/ILSpy/Images/OverlayProtected.png differ
diff --git a/ILSpy/Images/OverlayProtected.xaml b/ILSpy/Images/OverlayProtected.xaml
new file mode 100644
index 000000000..d5cb089b5
--- /dev/null
+++ b/ILSpy/Images/OverlayProtected.xaml
@@ -0,0 +1,7 @@
+<DrawingGroup xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+  <DrawingGroup.Children>
+    <GeometryDrawing Brush="#00000000" Geometry="M16 16h-16v-16h16v16z" />
+    <GeometryDrawing Brush="#FFF6F6F6" Geometry="m 6.9993696 12.5 -1.393 1.045 0.737 2.455 h -1.677 l -1.167 -0.875 -1.167 0.875 H 0.65536964 L 1.3913696 13.545 -6.3040099e-4 12.5 V 11 H 2.1543516 L 2.7540006 8.9998111 4.2433696 9 l 0.6 2 h 2.156 z" />
+    <GeometryDrawing Brush="#FF424242" Geometry="m 4.9993696 15 -1.5 -1.125 -1.5 1.125 0.551 -1.837 L 0.99936964 12 H 2.8993696 l 0.6 -2 0.6 2 h 1.9 l -1.551 1.163 z" />
+  </DrawingGroup.Children>
+</DrawingGroup>
\ No newline at end of file