Add SVGs for overlays and make Icons with overlays 20% smaller.

Replace ReferenceFolder icon.

ILSpy/ILSpy.csproj

@@ -341,6 +341,7 @@
     <Page Include="Images\OverlayProtected.xaml" />
     <Page Include="Images\OverlayStatic.xaml" />
     <Page Include="Images\Property.xaml" />
+    <Page Include="Images\ReferenceFolder.xaml" />
     <Page Include="Images\Refresh.xaml" />
     <Page Include="Images\Resource.xaml" />
     <Page Include="Images\ResourceImage.xaml" />
@@ -376,8 +377,7 @@
     <Resource Include="Images\Open.png" />
     <Resource Include="Images\Assembly.png" />
     <Resource Include="Images\Struct.png" />
-    <Resource Include="Images\ReferenceFolder.Closed.png" />
+    <Resource Include="Images\ReferenceFolder.png" />
-    <Resource Include="Images\ReferenceFolder.Open.png" />
     <Resource Include="Images\Event.png" />
     <Resource Include="Images\ExtensionMethod.png" />
     <Resource Include="Images\Indexer.png" />
@@ -524,6 +524,10 @@
     <Page Update="Images\Property.xaml">
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Update="Images\ReferenceFolder.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Update="Images\Refresh.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>

ILSpy/Images/Images.cs

@@ -66,8 +66,7 @@ namespace ICSharpCode.ILSpy
 		public static readonly object Library = Load("Library");
 		public static readonly object Namespace = Load("Namespace");
 
-		public static readonly BitmapImage ReferenceFolderOpen = LoadBitmap("ReferenceFolder.Open");
+		public static readonly object ReferenceFolder = Load("ReferenceFolder");
-		public static readonly BitmapImage ReferenceFolderClosed = LoadBitmap("ReferenceFolder.Closed");
 
 		public static readonly BitmapImage SubTypes = LoadBitmap("SubTypes");
 		public static readonly BitmapImage SuperTypes = LoadBitmap("SuperTypes");
@@ -386,16 +385,24 @@ namespace ICSharpCode.ILSpy
 			{
 				var group = new DrawingGroup();
 
-				if (baseImage is ImageSource img)
+				Drawing baseDrawing;
-					group.Children.Add(new ImageDrawing(img, iconRect));
+				if (baseImage is ImageSource img) {
-				else
+					baseDrawing = new ImageDrawing(img, iconRect);
-					group.Children.Add((DrawingGroup)baseImage);
+				} else {
+					baseDrawing = (DrawingGroup)baseImage;
+				}
 
 				if (overlay != null) {
+					var nestedGroup = new DrawingGroup { Transform = new ScaleTransform(0.8, 0.8) };
+					nestedGroup.Children.Add(baseDrawing);
+					group.Children.Add(nestedGroup);
+
 					if (overlay is ImageSource overlayImage)
 						group.Children.Add(new ImageDrawing(overlayImage, iconRect));
 					else
 						group.Children.Add((DrawingGroup)overlay);
+				} else {
+					group.Children.Add(baseDrawing);
 				}
 
 				if (isStatic) {

ILSpy/Images/OverlayInternal.svg

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="OverlayInternal.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2048"
+     inkscape:window-height="1089"
+     id="namedview10"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="22.627417"
+     inkscape:cx="22.106806"
+     inkscape:cy="5.9771371"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" />
+  <style
+     type="text/css"
+     id="style2">.icon-canvas-transparent{opacity:0;fill:#F6F6F6;} .icon-vs-out{fill:#F6F6F6;} .icon-vs-bg{fill:#424242;} .icon-vs-action-blue{fill:#00539C;}</style>
+  <path
+     class="icon-canvas-transparent"
+     d="M16 16h-16v-16h16v16z"
+     id="canvas" />
+  <path
+     class="icon-vs-out"
+     d="m 15.933709,11.437806 c 0,0.9695 -0.197,1.189 -0.54,1.631 -0.312,0.376 -2.148,2.535 -2.148,2.535 l -0.299,0.352 h -0.909 l -0.297,-0.332 c 0,0 -1.9530002,-2.175 -2.2460002,-2.529 -0.365,-0.469 -0.5005517,-1.201784 -0.500233,-1.778534 7.503e-4,-1.3579852 1.5391092,-2.3604662 2.3172492,-2.3604662 0.77814,0 0.982923,0.058309 1.182751,0.183466 0.394,-0.25 0.734233,-0.183466 1.010233,-0.183466 1.317,0 2.429,1.5125002 2.429,2.4820002 z"
+     id="outline"
+     inkscape:connector-curvature="0"
+     style="fill:#f6f6f6"
+     sodipodi:nodetypes="zccccccszcsz" />
+  <path
+     class="icon-vs-bg"
+     d="m 13.504709,9.9558058 c -0.527,0 -0.86,0.7470002 -1.071,1.2500002 -0.211,-0.503 -0.545,-1.2500002 -1.071,-1.2500002 -0.728,0 -1.4290002,0.6640002 -1.4290002,1.4820002 0,0.375 0.1270002,0.756 0.3290002,1.018 0.29,0.35 2.222,2.5 2.222,2.5 0,0 1.829,-2.15 2.119,-2.5 0.203,-0.262 0.33,-0.643 0.33,-1.018 0,-0.818 -0.7,-1.4820002 -1.429,-1.4820002 z"
+     id="iconBg"
+     inkscape:connector-curvature="0"
+     style="fill:#424242"
+     sodipodi:nodetypes="scsscccss" />
+</svg>

ILSpy/Images/OverlayPrivate.svg

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg9"
+   sodipodi:docname="OverlayPrivate.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   inkscape:export-filename="C:\Users\sie_p\Projects\ILSpy master\ILSpy\Images\OverlayPrivate.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <metadata
+     id="metadata15">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2048"
+     inkscape:window-height="1089"
+     id="namedview11"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="45.254834"
+     inkscape:cx="4.5858528"
+     inkscape:cy="6.3901414"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg9" />
+  <style
+     type="text/css"
+     id="style2">.icon-canvas-transparent{opacity:0;fill:#F6F6F6;} .icon-vs-out{fill:#F6F6F6;} .icon-vs-bg{fill:#424242;} .icon-vs-fg{fill:#F0EFF1;} .icon-vs-action-orange{fill:#C27D1A;}</style>
+  <path
+     class="icon-canvas-transparent"
+     d="M16 16h-16v-16h16v16z"
+     id="canvas" />
+  <path
+     class="icon-vs-out"
+     d="m 16,11 v 5 H 9 V 10.99501 H 9.1 C 9.2310581,9.8293885 9.2629692,8.007 12.422,8.007 L 12.594,8 c 2.78,0 3.21,1.827 3.329,3 z"
+     id="outline"
+     inkscape:connector-curvature="0"
+     style="fill:#f6f6f6"
+     sodipodi:nodetypes="ccccccccc" />
+  <path
+     class="icon-vs-bg"
+     d="M10.018 11.531c.13-1.125.18-2.531 2.576-2.531 2.227 0 2.285 1.412 2.37 2.531h-.966c-.014-.746-.155-1.541-1.404-1.541-1.241 0-1.516.812-1.575 1.541h-1.001zm4.982.469v3h-5v-3h5zm-2 1h-1v1h1v-1z"
+     id="notificationBg" />
+  <path
+     class="icon-vs-fg"
+     d="M12 13h1v1h-1v-1z"
+     id="notificationFg" />
+  <style
+     id="style17"
+     type="text/css">.icon-canvas-transparent{opacity:0;fill:#F6F6F6;} .icon-vs-out{fill:#F6F6F6;} .icon-vs-bg{fill:#424242;} .icon-vs-fg{fill:#F0EFF1;} .icon-vs-action-green{fill:#388A34;}</style>
+</svg>

ILSpy/Images/OverlayProtected.svg

@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="16"
+   height="16"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="OverlayProtected.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)">
+  <metadata
+     id="metadata14">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs12" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2048"
+     inkscape:window-height="1089"
+     id="namedview10"
+     showgrid="false"
+     showguides="true"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="10.429825"
+     inkscape:cx="6.2997664"
+     inkscape:cy="-5.261887"
+     inkscape:window-x="1912"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8" />
+  <style
+     type="text/css"
+     id="style2">.icon-canvas-transparent{opacity:0;fill:#F6F6F6;} .icon-vs-out{fill:#F6F6F6;} .icon-vs-bg{fill:#424242;} .icon-vs-action-orange{fill:#C27D1A;}</style>
+  <path
+     class="icon-canvas-transparent"
+     d="M16 16h-16v-16h16v16z"
+     id="canvas" />
+  <path
+     class="icon-vs-out"
+     d="m 15.98242,12.5 -1.393,1.045 0.737,2.455 h -1.677 l -1.167,-0.875 -1.167,0.875 H 9.6384205 L 10.37442,13.545 8.9824205,12.5 V 11 H 11.137402 L 11.737051,8.9998111 13.22642,9 l 0.6,2 h 2.156 z"
+     id="outline"
+     inkscape:connector-curvature="0"
+     style="fill:#f6f6f6"
+     sodipodi:nodetypes="cccccccccccccccc" />
+  <path
+     class="icon-vs-bg"
+     d="m 13.98242,15 -1.5,-1.125 -1.5,1.125 0.551,-1.837 L 9.9824205,12 H 11.88242 l 0.6,-2 0.6,2 h 1.9 l -1.551,1.163 z"
+     id="notificationBg"
+     inkscape:connector-curvature="0"
+     style="fill:#424242" />
+</svg>

ILSpy/Images/OverlayStatic.xaml

@@ -1,5 +1,5 @@
 <DrawingGroup xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-  <DrawingGroup.Children>
+	<DrawingGroup.Children>
     <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
     <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M7,16L16,16 16,7 7,7z" />
     <GeometryDrawing Brush="#FF414141" Geometry="F1M14,9L9,9 9,14 14,14z M15,15L8,15 8,8 15,8z" />

ILSpy/Images/ReferenceFolder.svg

@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   viewBox="0 0 16 16"
+   version="1.1"
+   id="svg12"
+   sodipodi:docname="ReferenceFolder.svg"
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"
+   inkscape:export-filename="C:\Users\sie_p\Projects\ILSpy master\ILSpy\Images\ReferenceFolder.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96">
+  <metadata
+     id="metadata18">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs16" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
+     id="namedview14"
+     showgrid="false"
+     inkscape:zoom="29.5"
+     inkscape:cx="12.96698"
+     inkscape:cy="6.467825"
+     inkscape:window-x="-8"
+     inkscape:window-y="340"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg12" />
+  <style
+     id="style2">.st0{opacity:0}.st0,.st1{fill:#f6f6f6}.st2{fill:#424242}</style>
+  <rect
+     id="rect3802"
+     width="16"
+     height="16"
+     x="-0.033898305"
+     y="0.033898298"
+     style="stroke:none;fill:#ffffff;fill-opacity:0" />
+  <g
+     id="g3796">
+    <path
+       style="display:inline;fill:#f6f6f6;stroke-width:0.66101694"
+       d="m 14.940678,2.7118644 c 0,1.9830508 0,3.9661017 0,5.9491526 -1.762712,0 -3.525424,0 -5.2881356,0 0,-0.661017 0,-1.3220339 0,-1.9830509 -0.440678,0 -0.8813559,0 -1.3220339,0 0,0.440678 0,0.8813557 0,1.3220339 -1.3220339,0 -2.6440678,0 -3.9661017,0 0,-1.5423729 0,-3.0847458 0,-4.6271186 1.3220339,0 2.6440678,0 3.9661017,0 0,0.4406779 0,0.8813559 0,1.3220338 0.440678,0 0.8813559,0 1.3220339,0 0,-0.6610169 0,-1.3220338 0,-1.9830508 1.7627116,0 3.5254236,0 5.2881356,0 z"
+       id="path6"
+       inkscape:connector-curvature="0" />
+    <path
+       class="st2"
+       d="M 5.0254237,4.0338983 H 7.6694915 V 7.3389831 H 5.0254237 Z M 10.313559,3.3728814 h 3.966102 V 8 H 10.313559 Z M 8.3305085,5.3559322 H 9.6525424 V 6.0169491 H 8.3305085 Z"
+       id="path9"
+       inkscape:connector-curvature="0"
+       style="fill:#424242;stroke-width:0.66101694" />
+  </g>
+  <g
+     id="g3800">
+    <path
+       class="st1"
+       d="m 11.635593,6.677966 v 5.949153 H 6.3474576 V 10.644068 H 5.0254237 v 1.322034 H 1.059322 V 7.338983 H 5.0254237 V 8.6610169 H 6.3474576 V 6.677966 Z"
+       id="path6-8"
+       inkscape:connector-curvature="0"
+       style="fill:#f6f6f6;stroke-width:0.66101694" />
+    <path
+       class="st2"
+       d="M 1.720339,7.9999999 H 4.3644068 V 11.305085 H 1.720339 Z M 7.0084746,7.338983 h 3.9661014 v 4.627119 H 7.0084746 Z M 5.0254237,9.3220339 H 6.3474576 V 9.9830508 H 5.0254237 Z"
+       id="path9-3"
+       inkscape:connector-curvature="0"
+       style="fill:#424242;stroke-width:0.66101694" />
+  </g>
+</svg>

ILSpy/TreeNodes/ReferenceFolderTreeNode.cs

@@ -46,11 +46,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 		}
 		
 		public override object Icon {
-			get { return Images.ReferenceFolderClosed; }
+			get { return Images.GetIcon(Images.ReferenceFolder); }
-		}
-		
-		public override object ExpandedIcon {
-			get { return Images.ReferenceFolderOpen; }
 		}
 		
 		protected override void LoadChildren()

ILSpy/TreeNodes/ResourceListTreeNode.cs

@@ -43,11 +43,11 @@ namespace ICSharpCode.ILSpy.TreeNodes
 		}
 		
 		public override object Icon {
-			get { return Images.FolderClosed; }
+			get { return Images.GetIcon(Images.FolderClosed); }
 		}
 
 		public override object ExpandedIcon {
-			get { return Images.FolderOpen; }
+			get { return Images.GetIcon(Images.FolderOpen); }
 		}
 		
 		protected override void LoadChildren()