Use DrawingImage instead of Viewbox.

6 years ago · cee9d86b7a
35 changed files with 325 additions and 597 deletions
--- a/ILSpy/Analyzers/TreeNodes/AnalyzedModuleTreeNode.cs
+++ b/ILSpy/Analyzers/TreeNodes/AnalyzedModuleTreeNode.cs
@ -33,7 +33,7 @@ namespace ICSharpCode.ILSpy.Analyzers.TreeNodes
				@@ -33,7 +33,7 @@ namespace ICSharpCode.ILSpy.Analyzers.TreeNodes
 			this.LazyLoading = true;
 		}

-		public override object Icon => Images.GetIcon(Images.Assembly);
+		public override object Icon => Images.Assembly;

 		public override object Text => analyzedModule.AssemblyName;

--- a/ILSpy/Images/AssemblyList.xaml
+++ b/ILSpy/Images/AssemblyList.xaml
@ -1,20 +1,10 @@
				@@ -1,20 +1,10 @@
 <!-- This file was generated by the AiToXaml tool.-->
 <!-- Tool Version: 14.0.22307.0 -->
-<Viewbox Width="16" Height="16" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-  <Rectangle Width="16" Height="16">
-    <Rectangle.Fill>
-      <DrawingBrush>
-        <DrawingBrush.Drawing>
-          <DrawingGroup>
-            <DrawingGroup.Children>
-              <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
-              <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M2.0187,-0.000199999999999534L2.0187,2.0188 -0.000300000000000189,2.0188 -0.000300000000000189,5.9998 2.0187,5.9998 2.0187,6.9998 -0.000300000000000189,6.9998 -0.000300000000000189,13.9998 6.0007,13.9998 6.0007,12.0008 7.9997,12.0008 7.9997,14.9998 15.9997,14.9998 15.9997,5.9998 7.9997,5.9998 7.9997,8.9998 6.0007,8.9998 6.0007,5.9998 7.9997,5.9998 7.9997,2.0188 6.0007,2.0188 6.0007,-0.000199999999999534z" />
-              <GeometryDrawing Brush="#FF424242" Geometry="F1M8,10L6,10 6,11 8,11z M5,8L1,8 1,13 5,13z M15,14L9,14 9,7 15,7z" />
-              <GeometryDrawing Brush="#FF388A34" Geometry="F1M7,3.0181L5,3.0181 5,1.0001 3.019,1.0001 3.019,3.0181 1,3.0181 1,5.0001 3.019,5.0001 3.019,7.0001 5,7.0001 5,5.0001 7,5.0001z" />
-            </DrawingGroup.Children>
-          </DrawingGroup>
-        </DrawingBrush.Drawing>
-      </DrawingBrush>
-    </Rectangle.Fill>
-  </Rectangle>
-</Viewbox>
+<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="F1M2.0187,-0.000199999999999534L2.0187,2.0188 -0.000300000000000189,2.0188 -0.000300000000000189,5.9998 2.0187,5.9998 2.0187,6.9998 -0.000300000000000189,6.9998 -0.000300000000000189,13.9998 6.0007,13.9998 6.0007,12.0008 7.9997,12.0008 7.9997,14.9998 15.9997,14.9998 15.9997,5.9998 7.9997,5.9998 7.9997,8.9998 6.0007,8.9998 6.0007,5.9998 7.9997,5.9998 7.9997,2.0188 6.0007,2.0188 6.0007,-0.000199999999999534z" />
+    <GeometryDrawing Brush="#FF424242" Geometry="F1M8,10L6,10 6,11 8,11z M5,8L1,8 1,13 5,13z M15,14L9,14 9,7 15,7z" />
+    <GeometryDrawing Brush="#FF388A34" Geometry="F1M7,3.0181L5,3.0181 5,1.0001 3.019,1.0001 3.019,3.0181 1,3.0181 1,5.0001 3.019,5.0001 3.019,7.0001 5,7.0001 5,5.0001 7,5.0001z" />
+  </DrawingGroup.Children>
+</DrawingGroup>
--- a/ILSpy/Images/AssemblyListGAC.svg
+++ b/ILSpy/Images/AssemblyListGAC.svg
@ -15,10 +15,10 @@
				@@ -15,10 +15,10 @@
   style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;"
   id="svg34"
   sodipodi:docname="AssemblyListGAC.svg"
-   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
+   inkscape:version="0.92.4 (5da689c313, 2019-01-14)"><metadata
     id="metadata40"><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
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
     id="defs38" /><sodipodi:namedview
     pagecolor="#ffffff"
     bordercolor="#666666"
@ -28,90 +28,57 @@
				@@ -28,90 +28,57 @@
     guidetolerance="10"
     inkscape:pageopacity="0"
     inkscape:pageshadow="2"
-     inkscape:window-width="2736"
-     inkscape:window-height="1719"
+     inkscape:window-width="1920"
+     inkscape:window-height="1017"
     id="namedview36"
     showgrid="false"
     inkscape:zoom="59"
-     inkscape:cx="8.247759"
-     inkscape:cy="7.9816404"
-     inkscape:window-x="-13"
-     inkscape:window-y="-13"
+     inkscape:cx="10.185456"
+     inkscape:cy="6.2184606"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
     inkscape:window-maximized="1"
-     inkscape:current-layer="g32" /><g
-     id="g32"><rect
-       id="canvas"
-       x="0"
-       y="0"
-       width="16"
-       height="16"
-       style="fill:#f6f6f6;fill-opacity:0;fill-rule:nonzero" /><path
-       id="outline"
-       d="m 16,6 v 9 H 8 V 12 H 6 v 2 H 0 V 7 H 2.019 V 6 H 0 V 2.018 H 2.019 V 0 H 6 V 2.018 H 8 V 6 H 6 V 9 H 8 V 6 Z"
-       style="fill:#f6f6f6;fill-rule:nonzero"
-       inkscape:connector-curvature="0" /><path
-       id="iconBg"
-       d="M 15,14 H 9 V 7 h 6 z M 5,8 H 1 v 5 h 4 z m 3,2 H 6 v 1 h 2 z"
-       style="fill:#424242;fill-rule:nonzero"
-       inkscape:connector-curvature="0" /><path
-       id="colorAction"
-       d="M 7,3.018 H 5 V 1 H 3.019 V 3.018 H 1 V 5 H 3.019 V 7 H 5 V 5 h 2 z"
-       style="fill:#388a34;fill-rule:nonzero"
-       inkscape:connector-curvature="0" /><rect
-       style="opacity:1;fill:#f6f6f6;fill-opacity:1;fill-rule:nonzero;stroke:#f6f6f6;stroke-width:0.92304718;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       id="rect855"
-       width="2.7318411"
-       height="2.2501209"
-       x="12.115051"
-       y="12.119209" /><rect
-       style="clip-rule:evenodd;opacity:1;fill:#f6f6f6;fill-opacity:1;fill-rule:nonzero;stroke:#f6f6f6;stroke-width:1.21481812;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-       id="rect855-8"
-       width="4.7318411"
-       height="2.2501209"
-       x="3.2681589"
-       y="12" /><g
-       transform="matrix(0.49383216,0,0,0.49383216,-2.0893099,13.325593)"
-       id="g30"
-       style="fill:#090909;fill-opacity:1;stroke:#f6f6f6;stroke-width:2.87553644;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"><g
-         transform="matrix(12,0,0,12,8.70948,4.01501)"
-         id="g8"
-         style="fill:#090909;fill-opacity:1;stroke:#f6f6f6;stroke-width:0.23962803;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"><path
-           d="M 0.412,-0.281 V -0.365 H 0.715 V -0.1 c -0.046,0.038 -0.094,0.065 -0.144,0.084 -0.049,0.019 -0.1,0.028 -0.152,0.028 -0.07,0 -0.134,-0.015 -0.192,-0.045 -0.057,-0.03 -0.101,-0.074 -0.13,-0.131 -0.029,-0.057 -0.044,-0.12 -0.044,-0.19 0,-0.07 0.015,-0.135 0.044,-0.196 0.029,-0.06 0.071,-0.105 0.126,-0.134 0.054,-0.029 0.117,-0.044 0.189,-0.044 0.051,0 0.098,0.008 0.14,0.025 0.042,0.017 0.075,0.04 0.098,0.07 0.024,0.03 0.042,0.069 0.055,0.117 L 0.619,-0.492 C 0.608,-0.529 0.595,-0.557 0.579,-0.578 0.563,-0.599 0.54,-0.616 0.511,-0.628 0.481,-0.641 0.448,-0.647 0.412,-0.647 0.369,-0.647 0.331,-0.64 0.3,-0.627 0.268,-0.614 0.243,-0.597 0.223,-0.575 0.204,-0.554 0.189,-0.53 0.178,-0.504 0.16,-0.46 0.151,-0.412 0.151,-0.36 c 0,0.063 0.011,0.117 0.033,0.16 0.022,0.043 0.054,0.075 0.096,0.096 0.042,0.02 0.086,0.031 0.134,0.031 0.041,0 0.081,-0.008 0.12,-0.024 0.039,-0.016 0.068,-0.033 0.089,-0.05 v -0.134 z"
-           style="fill:#090909;fill-opacity:1;fill-rule:nonzero;stroke:#f6f6f6;stroke-width:0.23962803;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-           id="path6"
-           inkscape:connector-curvature="0" /></g><g
-         transform="matrix(12,0,0,12,18.0435,4.01501)"
-         id="g12"
-         style="fill:#090909;fill-opacity:1;stroke:#f6f6f6;stroke-width:0.23962803;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"><path
-           d="M -0.001,0 0.273,-0.716 H 0.375 L 0.668,0 H 0.561 L 0.477,-0.217 H 0.178 L 0.099,0 Z M 0.205,-0.294 H 0.448 L 0.373,-0.492 C 0.35,-0.552 0.333,-0.602 0.322,-0.641 0.313,-0.595 0.3,-0.549 0.284,-0.504 Z"
-           style="fill:#090909;fill-opacity:1;fill-rule:nonzero;stroke:#f6f6f6;stroke-width:0.23962803;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-           id="path10"
-           inkscape:connector-curvature="0" /></g><g
-         transform="matrix(12,0,0,12,26.0474,4.01501)"
-         id="g16"
-         style="fill:#090909;fill-opacity:1;stroke:#f6f6f6;stroke-width:0.23962803;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"><path
-           d="m 0.588,-0.251 0.095,0.024 C 0.663,-0.149 0.627,-0.09 0.575,-0.049 0.524,-0.008 0.461,0.012 0.386,0.012 0.309,0.012 0.246,-0.003 0.198,-0.035 0.15,-0.066 0.113,-0.112 0.088,-0.171 0.062,-0.231 0.05,-0.295 0.05,-0.363 c 0,-0.075 0.014,-0.14 0.043,-0.195 0.028,-0.056 0.069,-0.098 0.121,-0.127 0.053,-0.029 0.111,-0.043 0.174,-0.043 0.071,0 0.132,0.018 0.18,0.055 0.049,0.036 0.083,0.087 0.102,0.153 L 0.577,-0.498 C 0.561,-0.55 0.536,-0.588 0.505,-0.611 0.473,-0.635 0.434,-0.647 0.386,-0.647 c -0.055,0 -0.101,0.013 -0.138,0.04 -0.037,0.026 -0.063,0.061 -0.078,0.106 -0.015,0.044 -0.023,0.09 -0.023,0.137 0,0.061 0.009,0.114 0.027,0.16 0.018,0.045 0.045,0.079 0.083,0.101 0.037,0.023 0.078,0.034 0.121,0.034 0.053,0 0.098,-0.015 0.135,-0.046 0.037,-0.03 0.062,-0.076 0.075,-0.136 z"
-           style="fill:#090909;fill-opacity:1;fill-rule:nonzero;stroke:#f6f6f6;stroke-width:0.23962803;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-           id="path14"
-           inkscape:connector-curvature="0" /></g><g
-         transform="matrix(12,0,0,12,8.70948,4.01501)"
-         id="g20"
-         style="fill:#090909;fill-opacity:1;stroke:#f6f6f6;stroke-width:0.23962803;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"><path
-           d="M 0.412,-0.281 V -0.365 H 0.715 V -0.1 c -0.046,0.038 -0.094,0.065 -0.144,0.084 -0.049,0.019 -0.1,0.028 -0.152,0.028 -0.07,0 -0.134,-0.015 -0.192,-0.045 -0.057,-0.03 -0.101,-0.074 -0.13,-0.131 -0.029,-0.057 -0.044,-0.12 -0.044,-0.19 0,-0.07 0.015,-0.135 0.044,-0.196 0.029,-0.06 0.071,-0.105 0.126,-0.134 0.054,-0.029 0.117,-0.044 0.189,-0.044 0.051,0 0.098,0.008 0.14,0.025 0.042,0.017 0.075,0.04 0.098,0.07 0.024,0.03 0.042,0.069 0.055,0.117 L 0.619,-0.492 C 0.608,-0.529 0.595,-0.557 0.579,-0.578 0.563,-0.599 0.54,-0.616 0.511,-0.628 0.481,-0.641 0.448,-0.647 0.412,-0.647 0.369,-0.647 0.331,-0.64 0.3,-0.627 0.268,-0.614 0.243,-0.597 0.223,-0.575 0.204,-0.554 0.189,-0.53 0.178,-0.504 0.16,-0.46 0.151,-0.412 0.151,-0.36 c 0,0.063 0.011,0.117 0.033,0.16 0.022,0.043 0.054,0.075 0.096,0.096 0.042,0.02 0.086,0.031 0.134,0.031 0.041,0 0.081,-0.008 0.12,-0.024 0.039,-0.016 0.068,-0.033 0.089,-0.05 v -0.134 z"
-           style="fill:#090909;fill-opacity:1;fill-rule:nonzero;stroke:#f6f6f6;stroke-width:0.23962803;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-           id="path18"
-           inkscape:connector-curvature="0" /></g><g
-         transform="matrix(12,0,0,12,18.0435,4.01501)"
-         id="g24"
-         style="fill:#090909;fill-opacity:1;stroke:#f6f6f6;stroke-width:0.23962803;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"><path
-           d="M -0.001,0 0.273,-0.716 H 0.375 L 0.668,0 H 0.561 L 0.477,-0.217 H 0.178 L 0.099,0 Z M 0.205,-0.294 H 0.448 L 0.373,-0.492 C 0.35,-0.552 0.333,-0.602 0.322,-0.641 0.313,-0.595 0.3,-0.549 0.284,-0.504 Z"
-           style="fill:#090909;fill-opacity:1;fill-rule:nonzero;stroke:#f6f6f6;stroke-width:0.23962803;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-           id="path22"
-           inkscape:connector-curvature="0" /></g><g
-         transform="matrix(12,0,0,12,26.0474,4.01501)"
-         id="g28"
-         style="fill:#090909;fill-opacity:1;stroke:#f6f6f6;stroke-width:0.23962803;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"><path
-           d="m 0.588,-0.251 0.095,0.024 C 0.663,-0.149 0.627,-0.09 0.575,-0.049 0.524,-0.008 0.461,0.012 0.386,0.012 0.309,0.012 0.246,-0.003 0.198,-0.035 0.15,-0.066 0.113,-0.112 0.088,-0.171 0.062,-0.231 0.05,-0.295 0.05,-0.363 c 0,-0.075 0.014,-0.14 0.043,-0.195 0.028,-0.056 0.069,-0.098 0.121,-0.127 0.053,-0.029 0.111,-0.043 0.174,-0.043 0.071,0 0.132,0.018 0.18,0.055 0.049,0.036 0.083,0.087 0.102,0.153 L 0.577,-0.498 C 0.561,-0.55 0.536,-0.588 0.505,-0.611 0.473,-0.635 0.434,-0.647 0.386,-0.647 c -0.055,0 -0.101,0.013 -0.138,0.04 -0.037,0.026 -0.063,0.061 -0.078,0.106 -0.015,0.044 -0.023,0.09 -0.023,0.137 0,0.061 0.009,0.114 0.027,0.16 0.018,0.045 0.045,0.079 0.083,0.101 0.037,0.023 0.078,0.034 0.121,0.034 0.053,0 0.098,-0.015 0.135,-0.046 0.037,-0.03 0.062,-0.076 0.075,-0.136 z"
-           style="fill:#090909;fill-opacity:1;fill-rule:nonzero;stroke:#f6f6f6;stroke-width:0.23962803;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
-           id="path26"
-           inkscape:connector-curvature="0" /></g></g></g></svg>
+     inkscape:current-layer="svg34" /><rect
+     style="fill:#f6f6f6;fill-opacity:0;fill-rule:nonzero"
+     height="16"
+     width="16"
+     y="0"
+     x="0"
+     id="canvas" /><path
+     inkscape:connector-curvature="0"
+     style="fill:#f6f6f6;fill-rule:nonzero"
+     d="m 16,6 v 9 H 8 V 12 H 6 v 2 H 0 V 7 H 2.019 V 6 H 0 V 2.018 H 2.019 V 0 H 6 V 2.018 H 8 V 6 H 6 V 9 H 8 V 6 Z"
+     id="outline" /><path
+     inkscape:connector-curvature="0"
+     style="fill:#424242;fill-rule:nonzero"
+     d="M 15,14 H 9 V 7 h 6 z M 5,8 H 1 v 5 h 4 z m 3,2 H 6 v 1 h 2 z"
+     id="iconBg" /><path
+     inkscape:connector-curvature="0"
+     style="fill:#388a34;fill-rule:nonzero"
+     d="M 7,3.018 H 5 V 1 H 3.019 V 3.018 H 1 V 5 H 3.019 V 7 H 5 V 5 h 2 z"
+     id="colorAction" /><path
+     style="opacity:1;fill:#f6f6f6;fill-opacity:1;fill-rule:nonzero;stroke:#f6f6f6;stroke-width:0.92304718;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
+     d="m 12.115051,12.119209 h 2.731841 v 2.250121 h -2.731841 z"
+     id="rect855" /><path
+     style="clip-rule:evenodd;opacity:1;fill:#f6f6f6;fill-opacity:1;fill-rule:nonzero;stroke:#f6f6f6;stroke-width:1.21481812;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
+     d="M 3.2681589,12 H 8 v 2.250121 H 3.2681589 Z"
+     id="rect855-8" /><path
+     inkscape:connector-curvature="0"
+     id="path6"
+     style="fill:#090909;fill-opacity:1;fill-rule:nonzero;stroke:#f6f6f6;stroke-width:1.42003238;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
+     d="m 4.6532176,13.643132 v -0.497783 h 1.7955738 v 1.570386 c -0.2725954,0.225188 -0.5570427,0.38519 -0.853342,0.497783 -0.2903733,0.112594 -0.5925986,0.165928 -0.9007499,0.165928 -0.414819,0 -0.7940821,-0.08889 -1.1377893,-0.266669 C 3.219129,14.934997 2.9583856,14.674254 2.7865321,14.336472 2.6146785,13.998691 2.5257887,13.625354 2.5257887,13.210535 c 0,-0.414819 0.08889,-0.800008 0.2607434,-1.161493 0.1718535,-0.355559 0.420745,-0.622229 0.7466742,-0.794082 0.3200032,-0.171854 0.6933403,-0.260744 1.1200113,-0.260744 0.3022253,0 0.5807466,0.04741 0.829638,0.14815 0.2488915,0.100742 0.444449,0.237039 0.5807467,0.414819 0.1422236,0.17778 0.2488914,0.408893 0.3259292,0.69334 L 5.8798967,12.392749 C 5.8147109,12.173488 5.737673,12.00756 5.6428573,11.883114 5.5480415,11.758668 5.4117438,11.657927 5.2398902,11.586815 5.0621106,11.509777 4.8665531,11.474221 4.6532176,11.474221 c -0.2548174,0 -0.4800048,0.04148 -0.6637104,0.11852 -0.1896316,0.07704 -0.3377812,0.177779 -0.4563009,0.308151 -0.1125938,0.124446 -0.2014835,0.26667 -0.2666694,0.420745 -0.1066677,0.260744 -0.1600016,0.545191 -0.1600016,0.853342 0,0.373337 0.065186,0.69334 0.1955575,0.948158 0.1303717,0.254817 0.3200033,0.444449 0.5688947,0.568895 0.2488914,0.118519 0.5096348,0.183705 0.7940821,0.183705 0.2429654,0 0.4800049,-0.04741 0.7111183,-0.142224 0.2311135,-0.09482 0.402967,-0.195557 0.5274127,-0.296299 v -0.794082 z" /><path
+     inkscape:connector-curvature="0"
+     id="path10"
+     style="fill:#090909;fill-opacity:1;fill-rule:nonzero;stroke:#f6f6f6;stroke-width:1.42003238;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
+     d="m 6.8152247,15.308334 1.6237201,-4.243006 h 0.6044506 l 1.7363136,4.243006 h -0.63408 L 9.647846,14.022395 H 7.8759762 l -0.4681529,1.285939 z m 1.2207531,-1.74224 H 9.4759924 L 9.0315434,12.392749 C 8.8952458,12.03719 8.794504,11.740891 8.7293181,11.509777 c -0.053334,0.272595 -0.1303716,0.545191 -0.2251874,0.81186 z" /><path
+     inkscape:connector-curvature="0"
+     id="path14"
+     style="fill:#090909;fill-opacity:1;fill-rule:nonzero;stroke:#f6f6f6;stroke-width:1.42003238;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
+     d="m 14.258214,13.820912 0.562968,0.142223 c -0.118519,0.462227 -0.331855,0.81186 -0.640006,1.054826 -0.302225,0.242965 -0.675563,0.361485 -1.120012,0.361485 -0.4563,0 -0.829638,-0.08889 -1.114085,-0.278521 -0.284447,-0.183706 -0.503709,-0.456301 -0.651858,-0.805935 -0.154076,-0.355559 -0.225188,-0.734822 -0.225188,-1.137789 0,-0.444449 0.08296,-0.829638 0.254818,-1.155567 0.165927,-0.331855 0.408893,-0.580747 0.717044,-0.7526 0.314077,-0.171854 0.657784,-0.254818 1.031121,-0.254818 0.420745,0 0.782231,0.106668 1.066678,0.32593 0.290373,0.213335 0.491857,0.51556 0.60445,0.906675 l -0.551116,0.130372 c -0.09482,-0.308151 -0.242966,-0.533339 -0.426671,-0.669636 -0.189632,-0.142224 -0.420745,-0.213336 -0.705193,-0.213336 -0.325929,0 -0.598524,0.07704 -0.817786,0.23704 -0.219261,0.154075 -0.373337,0.361485 -0.462226,0.628154 -0.08889,0.260743 -0.136298,0.533339 -0.136298,0.81186 0,0.361485 0.05333,0.675563 0.160001,0.948158 0.106668,0.266669 0.26667,0.468153 0.491857,0.598525 0.219262,0.136297 0.462227,0.201483 0.717045,0.201483 0.314077,0 0.580746,-0.08889 0.800008,-0.272595 0.219261,-0.17778 0.367411,-0.450375 0.444449,-0.805934 z" /><path
+     id="path26"
+     style="fill:#f6f6f6;fill-opacity:1;fill-rule:nonzero;stroke:#f6f6f6;stroke-width:1.42003238;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
+     d="m 14.258214,13.820912 0.562968,0.142223 c -0.118519,0.462227 -0.331855,0.81186 -0.640006,1.054826 -0.302225,0.242965 -0.675563,0.361485 -1.120012,0.361485 -0.4563,0 -0.829638,-0.08889 -1.114085,-0.278521 -0.284447,-0.183706 -0.503709,-0.456301 -0.651858,-0.805935 -0.154076,-0.355559 -0.225188,-0.734822 -0.225188,-1.137789 0,-0.444449 0.08296,-0.829638 0.254818,-1.155567 0.165927,-0.331855 0.408893,-0.580747 0.717044,-0.7526 0.314077,-0.171854 0.657784,-0.254818 1.031121,-0.254818 0.420745,0 0.782231,0.106668 1.066678,0.32593 0.290373,0.213335 0.491857,0.51556 0.60445,0.906675 l -0.551116,0.130372 c -0.09482,-0.308151 -0.242966,-0.533339 -0.426671,-0.669636 -0.189632,-0.142224 -0.420745,-0.213336 -0.705193,-0.213336 -0.325929,0 -0.598524,0.07704 -0.817786,0.23704 -0.219261,0.154075 -0.373337,0.361485 -0.462226,0.628154 -0.08889,0.260743 -0.136298,0.533339 -0.136298,0.81186 0,0.361485 0.05333,0.675563 0.160001,0.948158 0.106668,0.266669 0.26667,0.468153 0.491857,0.598525 0.219262,0.136297 0.462227,0.201483 0.717045,0.201483 0.314077,0 0.580746,-0.08889 0.800008,-0.272595 0.219261,-0.17778 0.367411,-0.450375 0.444449,-0.805934 z m -7.4429893,1.487422 1.6237201,-4.243006 h 0.6044506 l 1.7363136,4.243006 h -0.63408 L 9.647846,14.022395 H 7.8759762 l -0.4681529,1.285939 z m 1.2207531,-1.74224 H 9.4759924 L 9.0315434,12.392749 C 8.8952458,12.03719 8.794504,11.740891 8.7293181,11.509777 c -0.053334,0.272595 -0.1303716,0.545191 -0.2251874,0.81186 z m -3.3827602,0.07704 v -0.497783 h 1.7955738 v 1.570386 c -0.2725954,0.225188 -0.5570427,0.38519 -0.853342,0.497783 -0.2903733,0.112594 -0.5925986,0.165928 -0.9007499,0.165928 -0.414819,0 -0.7940821,-0.08889 -1.1377893,-0.266669 C 3.219129,14.934997 2.9583856,14.674254 2.7865321,14.336472 2.6146785,13.998691 2.5257887,13.625354 2.5257887,13.210535 c 0,-0.414819 0.08889,-0.800008 0.2607434,-1.161493 0.1718535,-0.355559 0.420745,-0.622229 0.7466742,-0.794082 0.3200032,-0.171854 0.6933403,-0.260744 1.1200113,-0.260744 0.3022253,0 0.5807466,0.04741 0.829638,0.14815 0.2488915,0.100742 0.444449,0.237039 0.5807467,0.414819 0.1422236,0.17778 0.2488914,0.408893 0.3259292,0.69334 L 5.8798967,12.392749 C 5.8147109,12.173488 5.737673,12.00756 5.6428573,11.883114 5.5480415,11.758668 5.4117438,11.657927 5.2398902,11.586815 5.0621106,11.509777 4.8665531,11.474221 4.6532176,11.474221 c -0.2548174,0 -0.4800048,0.04148 -0.6637104,0.11852 -0.1896316,0.07704 -0.3377812,0.177779 -0.4563009,0.308151 -0.1125938,0.124446 -0.2014835,0.26667 -0.2666694,0.420745 -0.1066677,0.260744 -0.1600016,0.545191 -0.1600016,0.853342 0,0.373337 0.065186,0.69334 0.1955575,0.948158 0.1303717,0.254817 0.3200033,0.444449 0.5688947,0.568895 0.2488914,0.118519 0.5096348,0.183705 0.7940821,0.183705 0.2429654,0 0.4800049,-0.04741 0.7111183,-0.142224 0.2311135,-0.09482 0.402967,-0.195557 0.5274127,-0.296299 v -0.794082 z" /><path
+     id="path26-2"
+     style="clip-rule:evenodd;fill:#090909;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.42003238;stroke-linejoin:round;stroke-miterlimit:2;stroke-dasharray:none;stroke-opacity:1;paint-order:stroke markers fill"
+     d="m 14.258214,13.820911 0.562968,0.142223 c -0.118519,0.462227 -0.331855,0.81186 -0.640006,1.054826 -0.302225,0.242965 -0.675563,0.361485 -1.120012,0.361485 -0.4563,0 -0.829638,-0.08889 -1.114085,-0.278521 -0.284447,-0.183706 -0.503709,-0.456301 -0.651858,-0.805935 -0.154076,-0.355559 -0.225188,-0.734822 -0.225188,-1.137789 0,-0.444449 0.08296,-0.829637 0.254818,-1.155566 0.165927,-0.331855 0.408893,-0.580747 0.717044,-0.7526 0.314077,-0.171854 0.657784,-0.254818 1.031121,-0.254818 0.420745,0 0.782231,0.106668 1.066678,0.32593 0.290373,0.213335 0.491857,0.51556 0.60445,0.906675 l -0.551116,0.130372 c -0.09482,-0.308151 -0.242966,-0.533339 -0.426671,-0.669636 -0.189632,-0.142224 -0.420745,-0.213336 -0.705193,-0.213336 -0.325929,0 -0.598524,0.07704 -0.817786,0.23704 -0.219261,0.154075 -0.373337,0.361485 -0.462226,0.628154 -0.08889,0.260742 -0.136298,0.533338 -0.136298,0.811859 0,0.361485 0.05333,0.675563 0.160001,0.948158 0.106668,0.266669 0.26667,0.468153 0.491857,0.598525 0.219262,0.136297 0.462227,0.201483 0.717045,0.201483 0.314077,0 0.580746,-0.08889 0.800008,-0.272595 0.219261,-0.17778 0.367411,-0.450375 0.444449,-0.805934 z m -7.442988,1.487422 1.623719,-4.243005 h 0.604451 l 1.736313,4.243005 h -0.63408 L 9.647846,14.022394 h -1.77187 l -0.468153,1.285939 z m 1.220752,-1.74224 H 9.475993 L 9.031544,12.392749 C 8.895246,12.03719 8.794504,11.740891 8.729319,11.509777 c -0.05333,0.272595 -0.130372,0.545191 -0.225188,0.81186 z m -3.3827591,0.07704 V 13.14535 H 6.448793 v 1.570386 c -0.272596,0.225188 -0.557043,0.38519 -0.853342,0.497783 -0.290374,0.112594 -0.592599,0.165928 -0.9007501,0.165928 -0.414819,0 -0.794082,-0.08889 -1.13779,-0.266669 -0.337781,-0.17778 -0.598524,-0.438523 -0.770378,-0.776305 -0.171853,-0.337781 -0.260743,-0.711118 -0.260743,-1.125937 0,-0.414819 0.08889,-0.800008 0.260743,-1.161492 0.171854,-0.355559 0.420745,-0.62223 0.746674,-0.794083 0.320004,-0.171854 0.693341,-0.260744 1.120012,-0.260744 0.302225,0 0.5807461,0.04741 0.8296381,0.14815 0.248891,0.100742 0.444449,0.237039 0.580746,0.414819 0.142224,0.177781 0.248892,0.408894 0.32593,0.693341 L 5.879898,12.392751 C 5.814708,12.17349 5.737674,12.007562 5.642858,11.883116 5.548038,11.75867 5.411745,11.657929 5.239891,11.586817 5.062112,11.509779 4.8665539,11.474223 4.6532189,11.474223 c -0.254818,0 -0.480005,0.04148 -0.663711,0.11852 -0.189631,0.07704 -0.337781,0.177779 -0.456301,0.308151 -0.112593,0.124446 -0.201483,0.26667 -0.266669,0.420745 -0.106668,0.260743 -0.160002,0.54519 -0.160002,0.853341 0,0.373337 0.06519,0.69334 0.195558,0.948158 0.130372,0.254817 0.320003,0.444449 0.568895,0.568895 0.248891,0.118519 0.509634,0.183705 0.794082,0.183705 0.242965,0 0.4800051,-0.04741 0.7111181,-0.142224 0.231114,-0.09482 0.402967,-0.195557 0.527413,-0.296299 v -0.794084 z"
+     inkscape:connector-curvature="0" /></svg>
--- a/ILSpy/Images/AssemblyListGAC.xaml
+++ b/ILSpy/Images/AssemblyListGAC.xaml
@ -1,97 +1,44 @@
				@@ -1,97 +1,44 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--This file is NOT compatible with Silverlight-->
-<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
-  <Canvas Name="svg34" Width="16" Height="16">
-    <Canvas.RenderTransform>
-      <TranslateTransform X="0" Y="0"/>
-    </Canvas.RenderTransform>
-    <Canvas.Resources/>
-    <!--Unknown tag: metadata-->
-    <!--Unknown tag: sodipodi:namedview-->
-    <Canvas Name="g32">
-      <Rectangle xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Canvas.Left="0" Canvas.Top="0" Width="16" Height="16" Name="canvas" Fill="#00F6F6F6" StrokeMiterLimit="2" StrokeLineJoin="Round"/>
-      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="outline" Fill="#FFF6F6F6" StrokeMiterLimit="2" StrokeLineJoin="Round">
-        <Path.Data>
-          <PathGeometry Figures="m 16 6 v 9 H 8 V 12 H 6 v 2 H 0 V 7 H 2.019 V 6 H 0 V 2.018 H 2.019 V 0 H 6 V 2.018 H 8 V 6 H 6 V 9 H 8 V 6 Z" FillRule="NonZero"/>
-        </Path.Data>
-      </Path>
-      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="iconBg" Fill="#FF424242" StrokeMiterLimit="2" StrokeLineJoin="Round">
-        <Path.Data>
-          <PathGeometry Figures="M 15 14 H 9 V 7 h 6 z M 5 8 H 1 v 5 h 4 z m 3 2 H 6 v 1 h 2 z" FillRule="NonZero"/>
-        </Path.Data>
-      </Path>
-      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="colorAction" Fill="#FF388A34" StrokeMiterLimit="2" StrokeLineJoin="Round">
-        <Path.Data>
-          <PathGeometry Figures="M 7 3.018 H 5 V 1 H 3.019 V 3.018 H 1 V 5 H 3.019 V 7 H 5 V 5 h 2 z" FillRule="NonZero"/>
-        </Path.Data>
-      </Path>
-      <Rectangle xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Canvas.Left="12.115051" Canvas.Top="12.119209" Width="2.7318411" Height="2.2501209" Name="rect855" Fill="#FFF6F6F6" StrokeThickness="0.92304718" Stroke="#FFF6F6F6" StrokeMiterLimit="2" StrokeLineJoin="Round" StrokeStartLineCap="Round" StrokeEndLineCap="Round" Opacity="1"/>
-      <Rectangle xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Canvas.Left="3.2681589" Canvas.Top="12" Width="4.7318411" Height="2.2501209" Name="rect8558" Fill="#FFF6F6F6" StrokeThickness="1.21481812" Stroke="#FFF6F6F6" StrokeMiterLimit="2" StrokeLineJoin="Round" StrokeStartLineCap="Round" StrokeEndLineCap="Round" Opacity="1"/>
-      <Canvas Name="g30" Opacity="1">
-        <Canvas.RenderTransform>
-          <MatrixTransform Matrix="0.49383216 0 0 0.49383216 -2.0893099 13.325593"/>
-        </Canvas.RenderTransform>
-        <Canvas Name="g8" Opacity="1">
-          <Canvas.RenderTransform>
-            <MatrixTransform Matrix="12 0 0 12 8.70948 4.01501"/>
-          </Canvas.RenderTransform>
-          <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path6" Fill="#FF090909" StrokeThickness="0.23962803" Stroke="#FFF6F6F6" StrokeMiterLimit="2" StrokeLineJoin="Round">
-            <Path.Data>
-              <PathGeometry Figures="M 0.412 -0.281 V -0.365 H 0.715 V -0.1 c -0.046 0.038 -0.094 0.065 -0.144 0.084 -0.049 0.019 -0.1 0.028 -0.152 0.028 -0.07 0 -0.134 -0.015 -0.192 -0.045 -0.057 -0.03 -0.101 -0.074 -0.13 -0.131 -0.029 -0.057 -0.044 -0.12 -0.044 -0.19 0 -0.07 0.015 -0.135 0.044 -0.196 0.029 -0.06 0.071 -0.105 0.126 -0.134 0.054 -0.029 0.117 -0.044 0.189 -0.044 0.051 0 0.098 0.008 0.14 0.025 0.042 0.017 0.075 0.04 0.098 0.07 0.024 0.03 0.042 0.069 0.055 0.117 L 0.619 -0.492 C 0.608 -0.529 0.595 -0.557 0.579 -0.578 0.563 -0.599 0.54 -0.616 0.511 -0.628 0.481 -0.641 0.448 -0.647 0.412 -0.647 0.369 -0.647 0.331 -0.64 0.3 -0.627 0.268 -0.614 0.243 -0.597 0.223 -0.575 0.204 -0.554 0.189 -0.53 0.178 -0.504 0.16 -0.46 0.151 -0.412 0.151 -0.36 c 0 0.063 0.011 0.117 0.033 0.16 0.022 0.043 0.054 0.075 0.096 0.096 0.042 0.02 0.086 0.031 0.134 0.031 0.041 0 0.081 -0.008 0.12 -0.024 0.039 -0.016 0.068 -0.033 0.089 -0.05 v -0.134 z" FillRule="NonZero"/>
-            </Path.Data>
-          </Path>
-        </Canvas>
-        <Canvas Name="g12" Opacity="1">
-          <Canvas.RenderTransform>
-            <MatrixTransform Matrix="12 0 0 12 18.0435 4.01501"/>
-          </Canvas.RenderTransform>
-          <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path10" Fill="#FF090909" StrokeThickness="0.23962803" Stroke="#FFF6F6F6" StrokeMiterLimit="2" StrokeLineJoin="Round">
-            <Path.Data>
-              <PathGeometry Figures="M -0.001 0 0.273 -0.716 H 0.375 L 0.668 0 H 0.561 L 0.477 -0.217 H 0.178 L 0.099 0 Z M 0.205 -0.294 H 0.448 L 0.373 -0.492 C 0.35 -0.552 0.333 -0.602 0.322 -0.641 0.313 -0.595 0.3 -0.549 0.284 -0.504 Z" FillRule="NonZero"/>
-            </Path.Data>
-          </Path>
-        </Canvas>
-        <Canvas Name="g16" Opacity="1">
-          <Canvas.RenderTransform>
-            <MatrixTransform Matrix="12 0 0 12 26.0474 4.01501"/>
-          </Canvas.RenderTransform>
-          <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path14" Fill="#FF090909" StrokeThickness="0.23962803" Stroke="#FFF6F6F6" StrokeMiterLimit="2" StrokeLineJoin="Round">
-            <Path.Data>
-              <PathGeometry Figures="m 0.588 -0.251 0.095 0.024 C 0.663 -0.149 0.627 -0.09 0.575 -0.049 0.524 -0.008 0.461 0.012 0.386 0.012 0.309 0.012 0.246 -0.003 0.198 -0.035 0.15 -0.066 0.113 -0.112 0.088 -0.171 0.062 -0.231 0.05 -0.295 0.05 -0.363 c 0 -0.075 0.014 -0.14 0.043 -0.195 0.028 -0.056 0.069 -0.098 0.121 -0.127 0.053 -0.029 0.111 -0.043 0.174 -0.043 0.071 0 0.132 0.018 0.18 0.055 0.049 0.036 0.083 0.087 0.102 0.153 L 0.577 -0.498 C 0.561 -0.55 0.536 -0.588 0.505 -0.611 0.473 -0.635 0.434 -0.647 0.386 -0.647 c -0.055 0 -0.101 0.013 -0.138 0.04 -0.037 0.026 -0.063 0.061 -0.078 0.106 -0.015 0.044 -0.023 0.09 -0.023 0.137 0 0.061 0.009 0.114 0.027 0.16 0.018 0.045 0.045 0.079 0.083 0.101 0.037 0.023 0.078 0.034 0.121 0.034 0.053 0 0.098 -0.015 0.135 -0.046 0.037 -0.03 0.062 -0.076 0.075 -0.136 z" FillRule="NonZero"/>
-            </Path.Data>
-          </Path>
-        </Canvas>
-        <Canvas Name="g20" Opacity="1">
-          <Canvas.RenderTransform>
-            <MatrixTransform Matrix="12 0 0 12 8.70948 4.01501"/>
-          </Canvas.RenderTransform>
-          <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path18" Fill="#FF090909" StrokeThickness="0.23962803" Stroke="#00F6F6F6" StrokeMiterLimit="2" StrokeLineJoin="Round">
-            <Path.Data>
-              <PathGeometry Figures="M 0.412 -0.281 V -0.365 H 0.715 V -0.1 c -0.046 0.038 -0.094 0.065 -0.144 0.084 -0.049 0.019 -0.1 0.028 -0.152 0.028 -0.07 0 -0.134 -0.015 -0.192 -0.045 -0.057 -0.03 -0.101 -0.074 -0.13 -0.131 -0.029 -0.057 -0.044 -0.12 -0.044 -0.19 0 -0.07 0.015 -0.135 0.044 -0.196 0.029 -0.06 0.071 -0.105 0.126 -0.134 0.054 -0.029 0.117 -0.044 0.189 -0.044 0.051 0 0.098 0.008 0.14 0.025 0.042 0.017 0.075 0.04 0.098 0.07 0.024 0.03 0.042 0.069 0.055 0.117 L 0.619 -0.492 C 0.608 -0.529 0.595 -0.557 0.579 -0.578 0.563 -0.599 0.54 -0.616 0.511 -0.628 0.481 -0.641 0.448 -0.647 0.412 -0.647 0.369 -0.647 0.331 -0.64 0.3 -0.627 0.268 -0.614 0.243 -0.597 0.223 -0.575 0.204 -0.554 0.189 -0.53 0.178 -0.504 0.16 -0.46 0.151 -0.412 0.151 -0.36 c 0 0.063 0.011 0.117 0.033 0.16 0.022 0.043 0.054 0.075 0.096 0.096 0.042 0.02 0.086 0.031 0.134 0.031 0.041 0 0.081 -0.008 0.12 -0.024 0.039 -0.016 0.068 -0.033 0.089 -0.05 v -0.134 z" FillRule="NonZero"/>
-            </Path.Data>
-          </Path>
-        </Canvas>
-        <Canvas Name="g24" Opacity="1">
-          <Canvas.RenderTransform>
-            <MatrixTransform Matrix="12 0 0 12 18.0435 4.01501"/>
-          </Canvas.RenderTransform>
-          <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path22" Fill="#FF090909" StrokeThickness="0.23962803" Stroke="#00F6F6F6" StrokeMiterLimit="2" StrokeLineJoin="Round">
-            <Path.Data>
-              <PathGeometry Figures="M -0.001 0 0.273 -0.716 H 0.375 L 0.668 0 H 0.561 L 0.477 -0.217 H 0.178 L 0.099 0 Z M 0.205 -0.294 H 0.448 L 0.373 -0.492 C 0.35 -0.552 0.333 -0.602 0.322 -0.641 0.313 -0.595 0.3 -0.549 0.284 -0.504 Z" FillRule="NonZero"/>
-            </Path.Data>
-          </Path>
-        </Canvas>
-        <Canvas Name="g28" Opacity="1">
-          <Canvas.RenderTransform>
-            <MatrixTransform Matrix="12 0 0 12 26.0474 4.01501"/>
-          </Canvas.RenderTransform>
-          <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path26" Fill="#FF090909" StrokeThickness="0.23962803" Stroke="#00F6F6F6" StrokeMiterLimit="2" StrokeLineJoin="Round">
-            <Path.Data>
-              <PathGeometry Figures="m 0.588 -0.251 0.095 0.024 C 0.663 -0.149 0.627 -0.09 0.575 -0.049 0.524 -0.008 0.461 0.012 0.386 0.012 0.309 0.012 0.246 -0.003 0.198 -0.035 0.15 -0.066 0.113 -0.112 0.088 -0.171 0.062 -0.231 0.05 -0.295 0.05 -0.363 c 0 -0.075 0.014 -0.14 0.043 -0.195 0.028 -0.056 0.069 -0.098 0.121 -0.127 0.053 -0.029 0.111 -0.043 0.174 -0.043 0.071 0 0.132 0.018 0.18 0.055 0.049 0.036 0.083 0.087 0.102 0.153 L 0.577 -0.498 C 0.561 -0.55 0.536 -0.588 0.505 -0.611 0.473 -0.635 0.434 -0.647 0.386 -0.647 c -0.055 0 -0.101 0.013 -0.138 0.04 -0.037 0.026 -0.063 0.061 -0.078 0.106 -0.015 0.044 -0.023 0.09 -0.023 0.137 0 0.061 0.009 0.114 0.027 0.16 0.018 0.045 0.045 0.079 0.083 0.101 0.037 0.023 0.078 0.034 0.121 0.034 0.053 0 0.098 -0.015 0.135 -0.046 0.037 -0.03 0.062 -0.076 0.075 -0.136 z" FillRule="NonZero"/>
-            </Path.Data>
-          </Path>
-        </Canvas>
-      </Canvas>
-    </Canvas>
-  </Canvas>
-</Viewbox>
+<DrawingGroup xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" ClipGeometry="M0,0 V16 H16 V0 H0 Z">
+  <GeometryDrawing>
+	<GeometryDrawing.Brush>
+	  <SolidColorBrush Color="#FFF6F6F6" Opacity="0" />
+	</GeometryDrawing.Brush>
+	<GeometryDrawing.Geometry>
+	  <RectangleGeometry RadiusX="0" RadiusY="0" Rect="0,0,16,16" />
+	</GeometryDrawing.Geometry>
+  </GeometryDrawing>
+  <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1 M16,16z M0,0z M16,6L16,15 8,15 8,12 6,12 6,14 0,14 0,7 2.019,7 2.019,6 0,6 0,2.018 2.019,2.018 2.019,0 6,0 6,2.018 8,2.018 8,6 6,6 6,9 8,9 8,6z" />
+  <GeometryDrawing Brush="#FF424242" Geometry="F1 M16,16z M0,0z M15,14L9,14 9,7 15,7z M5,8L1,8 1,13 5,13z M8,10L6,10 6,11 8,11z" />
+  <GeometryDrawing Brush="#FF388A34" Geometry="F1 M16,16z M0,0z M7,3.018L5,3.018 5,1 3.019,1 3.019,3.018 1,3.018 1,5 3.019,5 3.019,7 5,7 5,5 7,5z" />
+  <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1 M16,16z M0,0z M12.115051,12.119209L14.846892,12.119209 14.846892,14.36933 12.115051,14.36933z">
+	<GeometryDrawing.Pen>
+	  <Pen Brush="#FFF6F6F6" Thickness="0.92304718" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />
+	</GeometryDrawing.Pen>
+  </GeometryDrawing>
+  <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1 M16,16z M0,0z M3.2681589,12L8,12 8,14.250121 3.2681589,14.250121z">
+	<GeometryDrawing.Pen>
+	  <Pen Brush="#FFF6F6F6" Thickness="1.21481812" StartLineCap="Round" EndLineCap="Round" LineJoin="Round" />
+	</GeometryDrawing.Pen>
+  </GeometryDrawing>
+  <GeometryDrawing Brush="#FF090909" Geometry="F1 M16,16z M0,0z M4.6532176,13.643132L4.6532176,13.145349 6.4487914,13.145349 6.4487914,14.715735C6.176196,14.940923 5.8917487,15.100925 5.5954494,15.213518 5.3050761,15.326112 5.0028508,15.379446 4.6946995,15.379446 4.2798805,15.379446 3.9006174,15.290556 3.5569102,15.112777 3.219129,14.934997 2.9583856,14.674254 2.7865321,14.336472 2.6146785,13.998691 2.5257887,13.625354 2.5257887,13.210535 2.5257887,12.795716 2.6146787,12.410527 2.7865321,12.049042 2.9583856,11.693483 3.2072771,11.426813 3.5332063,11.25496 3.8532095,11.083106 4.2265466,10.994216 4.6532176,10.994216 4.9554429,10.994216 5.2339642,11.041626 5.4828556,11.142366 5.7317471,11.243108 5.9273046,11.379405 6.0636023,11.557185 6.2058259,11.734965 6.3124937,11.966078 6.3895315,12.250525L5.8798967,12.392749C5.8147109,12.173488 5.737673,12.00756 5.6428573,11.883114 5.5480415,11.758668 5.4117438,11.657927 5.2398902,11.586815 5.0621106,11.509777 4.8665531,11.474221 4.6532176,11.474221 4.3984002,11.474221 4.1732128,11.515701 3.9895072,11.592741 3.7998756,11.669781 3.651726,11.77052 3.5332063,11.900892 3.4206125,12.025338 3.3317228,12.167562 3.2665369,12.321637 3.1598692,12.582381 3.1065353,12.866828 3.1065353,13.174979 3.1065353,13.548316 3.1717213,13.868319 3.3020928,14.123137 3.4324645,14.377954 3.6220961,14.567586 3.8709875,14.692032 4.1198789,14.810551 4.3806223,14.875737 4.6650696,14.875737 4.908035,14.875737 5.1450745,14.828327 5.3761879,14.733513 5.6073014,14.638693 5.7791549,14.537956 5.9036006,14.437214L5.9036006,13.643132z">
+	<GeometryDrawing.Pen>
+	  <Pen Brush="#FFF6F6F6" Thickness="1.42003238" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Round" />
+	</GeometryDrawing.Pen>
+  </GeometryDrawing>
+  <GeometryDrawing Brush="#FF090909" Geometry="F1 M16,16z M0,0z M6.8152247,15.308334L8.4389448,11.065328 9.0433954,11.065328 10.779709,15.308334 10.145629,15.308334 9.647846,14.022395 7.8759762,14.022395 7.4078233,15.308334z M8.0359778,13.566094L9.4759924,13.566094 9.0315434,12.392749C8.8952458,12.03719 8.794504,11.740891 8.7293181,11.509777 8.6759841,11.782372 8.5989465,12.054968 8.5041307,12.321637z">
+	<GeometryDrawing.Pen>
+	  <Pen Brush="#FFF6F6F6" Thickness="1.42003238" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Round" />
+	</GeometryDrawing.Pen>
+  </GeometryDrawing>
+  <GeometryDrawing Brush="#FF090909" Geometry="F1 M16,16z M0,0z M14.258214,13.820912L14.821182,13.963135C14.702663,14.425362 14.489327,14.774995 14.181176,15.017961 13.878951,15.260926 13.505613,15.379446 13.061164,15.379446 12.604864,15.379446 12.231526,15.290556 11.947079,15.100925 11.662632,14.917219 11.44337,14.644624 11.295221,14.29499 11.141145,13.939431 11.070033,13.560168 11.070033,13.157201 11.070033,12.712752 11.152993,12.327563 11.324851,12.001634 11.490778,11.669779 11.733744,11.420887 12.041895,11.249034 12.355972,11.07718 12.699679,10.994216 13.073016,10.994216 13.493761,10.994216 13.855247,11.100884 14.139694,11.320146 14.430067,11.533481 14.631551,11.835706 14.744144,12.226821L14.193028,12.357193C14.098208,12.049042 13.950062,11.823854 13.766357,11.687557 13.576725,11.545333 13.345612,11.474221 13.061164,11.474221 12.735235,11.474221 12.46264,11.551261 12.243378,11.711261 12.024117,11.865336 11.870041,12.072746 11.781152,12.339415 11.692262,12.600158 11.644854,12.872754 11.644854,13.151275 11.644854,13.51276 11.698184,13.826838 11.804855,14.099433 11.911523,14.366102 12.071525,14.567586 12.296712,14.697958 12.515974,14.834255 12.758939,14.899441 13.013757,14.899441 13.327834,14.899441 13.594503,14.810551 13.813765,14.626846 14.033026,14.449066 14.181176,14.176471 14.258214,13.820912z">
+	<GeometryDrawing.Pen>
+	  <Pen Brush="#FFF6F6F6" Thickness="1.42003238" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Round" />
+	</GeometryDrawing.Pen>
+  </GeometryDrawing>
+  <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1 M16,16z M0,0z M14.258214,13.820912L14.821182,13.963135C14.702663,14.425362 14.489327,14.774995 14.181176,15.017961 13.878951,15.260926 13.505613,15.379446 13.061164,15.379446 12.604864,15.379446 12.231526,15.290556 11.947079,15.100925 11.662632,14.917219 11.44337,14.644624 11.295221,14.29499 11.141145,13.939431 11.070033,13.560168 11.070033,13.157201 11.070033,12.712752 11.152993,12.327563 11.324851,12.001634 11.490778,11.669779 11.733744,11.420887 12.041895,11.249034 12.355972,11.07718 12.699679,10.994216 13.073016,10.994216 13.493761,10.994216 13.855247,11.100884 14.139694,11.320146 14.430067,11.533481 14.631551,11.835706 14.744144,12.226821L14.193028,12.357193C14.098208,12.049042 13.950062,11.823854 13.766357,11.687557 13.576725,11.545333 13.345612,11.474221 13.061164,11.474221 12.735235,11.474221 12.46264,11.551261 12.243378,11.711261 12.024117,11.865336 11.870041,12.072746 11.781152,12.339415 11.692262,12.600158 11.644854,12.872754 11.644854,13.151275 11.644854,13.51276 11.698184,13.826838 11.804855,14.099433 11.911523,14.366102 12.071525,14.567586 12.296712,14.697958 12.515974,14.834255 12.758939,14.899441 13.013757,14.899441 13.327834,14.899441 13.594503,14.810551 13.813765,14.626846 14.033026,14.449066 14.181176,14.176471 14.258214,13.820912z M6.8152247,15.308334L8.4389448,11.065328 9.0433954,11.065328 10.779709,15.308334 10.145629,15.308334 9.647846,14.022395 7.8759762,14.022395 7.4078233,15.308334z M8.0359778,13.566094L9.4759924,13.566094 9.0315434,12.392749C8.8952458,12.03719 8.794504,11.740891 8.7293181,11.509777 8.6759841,11.782372 8.5989465,12.054968 8.5041307,12.321637z M4.6532176,13.643134L4.6532176,13.145351 6.4487914,13.145351 6.4487914,14.715737C6.176196,14.940925 5.8917487,15.100927 5.5954494,15.21352 5.3050761,15.326114 5.0028508,15.379448 4.6946995,15.379448 4.2798805,15.379448 3.9006174,15.290558 3.5569102,15.112779 3.219129,14.934997 2.9583856,14.674254 2.7865321,14.336472 2.6146785,13.998691 2.5257887,13.625354 2.5257887,13.210535 2.5257887,12.795716 2.6146787,12.410527 2.7865321,12.049042 2.9583856,11.693483 3.2072771,11.426813 3.5332063,11.25496 3.8532095,11.083106 4.2265466,10.994216 4.6532176,10.994216 4.9554429,10.994216 5.2339642,11.041626 5.4828556,11.142366 5.7317471,11.243108 5.9273046,11.379405 6.0636023,11.557185 6.2058259,11.734965 6.3124937,11.966078 6.3895315,12.250525L5.8798967,12.392749C5.8147109,12.173488 5.737673,12.00756 5.6428573,11.883114 5.5480415,11.758668 5.4117438,11.657927 5.2398902,11.586815 5.0621106,11.509777 4.8665531,11.474221 4.6532176,11.474221 4.3984002,11.474221 4.1732128,11.515701 3.9895072,11.592741 3.7998756,11.669781 3.651726,11.77052 3.5332063,11.900892 3.4206125,12.025338 3.3317228,12.167562 3.2665369,12.321637 3.1598692,12.582381 3.1065353,12.866828 3.1065353,13.174979 3.1065353,13.548316 3.1717213,13.868319 3.3020928,14.123137 3.4324645,14.377954 3.6220961,14.567586 3.8709875,14.692032 4.1198789,14.810551 4.3806223,14.875737 4.6650696,14.875737 4.908035,14.875737 5.1450745,14.828327 5.3761879,14.733513 5.6073014,14.638693 5.7791549,14.537956 5.9036006,14.437214L5.9036006,13.643132z">
+	<GeometryDrawing.Pen>
+	  <Pen Brush="#FFF6F6F6" Thickness="1.42003238" StartLineCap="Flat" EndLineCap="Flat" LineJoin="Round" />
+	</GeometryDrawing.Pen>
+  </GeometryDrawing>
+  <GeometryDrawing Brush="#FF090909" Geometry="F1 M16,16z M0,0z M14.258214,13.820911L14.821182,13.963134C14.702663,14.425361 14.489327,14.774994 14.181176,15.01796 13.878951,15.260925 13.505613,15.379445 13.061164,15.379445 12.604864,15.379445 12.231526,15.290555 11.947079,15.100924 11.662632,14.917218 11.44337,14.644623 11.295221,14.294989 11.141145,13.93943 11.070033,13.560167 11.070033,13.1572 11.070033,12.712751 11.152993,12.327563 11.324851,12.001634 11.490778,11.669779 11.733744,11.420887 12.041895,11.249034 12.355972,11.07718 12.699679,10.994216 13.073016,10.994216 13.493761,10.994216 13.855247,11.100884 14.139694,11.320146 14.430067,11.533481 14.631551,11.835706 14.744144,12.226821L14.193028,12.357193C14.098208,12.049042 13.950062,11.823854 13.766357,11.687557 13.576725,11.545333 13.345612,11.474221 13.061164,11.474221 12.735235,11.474221 12.46264,11.551261 12.243378,11.711261 12.024117,11.865336 11.870041,12.072746 11.781152,12.339415 11.692262,12.600157 11.644854,12.872753 11.644854,13.151274 11.644854,13.512759 11.698184,13.826837 11.804855,14.099432 11.911523,14.366101 12.071525,14.567585 12.296712,14.697957 12.515974,14.834254 12.758939,14.89944 13.013757,14.89944 13.327834,14.89944 13.594503,14.81055 13.813765,14.626845 14.033026,14.449065 14.181176,14.17647 14.258214,13.820911z M6.815226,15.308333L8.438945,11.065328 9.043396,11.065328 10.779709,15.308333 10.145629,15.308333 9.647846,14.022394 7.875976,14.022394 7.407823,15.308333z M8.035978,13.566093L9.475993,13.566093 9.031544,12.392749C8.895246,12.03719 8.794504,11.740891 8.729319,11.509777 8.675989,11.782372 8.598947,12.054968 8.504131,12.321637z M4.6532189,13.643133L4.6532189,13.14535 6.448793,13.14535 6.448793,14.715736C6.176197,14.940924 5.89175,15.100926 5.595451,15.213519 5.305077,15.326113 5.002852,15.379447 4.6947009,15.379447 4.2798819,15.379447 3.9006189,15.290557 3.5569109,15.112778 3.2191299,14.934998 2.9583869,14.674255 2.7865329,14.336473 2.6146799,13.998692 2.5257899,13.625355 2.5257899,13.210536 2.5257899,12.795717 2.6146799,12.410528 2.7865329,12.049044 2.9583869,11.693485 3.2072779,11.426814 3.5332069,11.254961 3.8532109,11.083107 4.2265479,10.994217 4.6532189,10.994217 4.9554439,10.994217 5.233965,11.041627 5.482857,11.142367 5.731748,11.243109 5.927306,11.379406 6.063603,11.557186 6.205827,11.734967 6.312495,11.96608 6.389533,12.250527L5.879898,12.392751C5.814708,12.17349 5.737674,12.007562 5.642858,11.883116 5.548038,11.75867 5.411745,11.657929 5.239891,11.586817 5.062112,11.509779 4.8665539,11.474223 4.6532189,11.474223 4.3984009,11.474223 4.1732139,11.515703 3.9895079,11.592743 3.7998769,11.669783 3.6517269,11.770522 3.5332069,11.900894 3.4206139,12.02534 3.3317239,12.167564 3.2665379,12.321639 3.1598699,12.582382 3.1065359,12.866829 3.1065359,13.17498 3.1065359,13.548317 3.1717259,13.86832 3.3020939,14.123138 3.4324659,14.377955 3.6220969,14.567587 3.8709889,14.692033 4.1198799,14.810552 4.3806229,14.875738 4.6650709,14.875738 4.9080359,14.875738 5.145076,14.828328 5.376189,14.733514 5.607303,14.638694 5.779156,14.537957 5.903602,14.437215L5.903602,13.643131z" />
+</DrawingGroup>
--- a/ILSpy/Images/Back.xaml
+++ b/ILSpy/Images/Back.xaml
@ -1,20 +1,10 @@
				@@ -1,20 +1,10 @@
 <!-- This file was generated by the AiToXaml tool.-->
 <!-- Tool Version: 14.0.22307.0 -->
-<Viewbox Width="16" Height="16" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-  <Rectangle Width="16" Height="16">
-    <Rectangle.Fill>
-      <DrawingBrush>
-        <DrawingBrush.Drawing>
-          <DrawingGroup>
-            <DrawingGroup.Children>
-              <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
-              <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M15,8C15,11.866 11.866,15 8,15 4.134,15 1,11.866 1,8 1,4.134 4.134,1 8,1 11.866,1 15,4.134 15,8" />
-              <GeometryDrawing Brush="#FF00539C" Geometry="F1M4,8L7,5 9,5 7,7 12,7 12,9 7,9 9,11 7,11z M2,8C2,11.247 4.755,14 8,14 11.245,14 14,11.247 14,8 14,4.756 11.245,2 8,2 4.755,2 2,4.756 2,8" />
-              <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M4,8L7,5 9,5 7,7 12,7 12,9 7,9 9,11 7,11z" />
-            </DrawingGroup.Children>
-          </DrawingGroup>
-        </DrawingBrush.Drawing>
-      </DrawingBrush>
-    </Rectangle.Fill>
-  </Rectangle>
-</Viewbox>
+<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="F1M15,8C15,11.866 11.866,15 8,15 4.134,15 1,11.866 1,8 1,4.134 4.134,1 8,1 11.866,1 15,4.134 15,8" />
+    <GeometryDrawing Brush="#FF00539C" Geometry="F1M4,8L7,5 9,5 7,7 12,7 12,9 7,9 9,11 7,11z M2,8C2,11.247 4.755,14 8,14 11.245,14 14,11.247 14,8 14,4.756 11.245,2 8,2 4.755,2 2,4.756 2,8" />
+    <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M4,8L7,5 9,5 7,7 12,7 12,9 7,9 9,11 7,11z" />
+  </DrawingGroup.Children>
+</DrawingGroup>
--- a/ILSpy/Images/CollapseAll.xaml
+++ b/ILSpy/Images/CollapseAll.xaml
@ -1,21 +1,11 @@
				@@ -1,21 +1,11 @@
 <!-- This file was generated by the AiToXaml tool.-->
 <!-- Tool Version: 14.0.22307.0 -->
-<Viewbox Width="16" Height="16" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-  <Rectangle Width="16" Height="16">
-    <Rectangle.Fill>
-      <DrawingBrush>
-        <DrawingBrush.Drawing>
-          <DrawingGroup>
-            <DrawingGroup.Children>
-              <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
-              <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M15,10L13,10 13,12 11,12 11,14 2,14 2,5 4,5 4,3 6,3 6,1 15,1z" />
-              <GeometryDrawing Brush="#FF424242" Geometry="F1M9,7L4,7 4,12 9,12z M10,13L3,13 3,6 10,6z M5,4L5,5 6,5 11,5 11,10 11,11 12,11 12,4z M14,2L14,9 13,9 13,8 13,3 8,3 7,3 7,2z" />
-              <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M8,10L5,10 5,9 8,9z M4,12L9,12 9,7 4,7z" />
-              <GeometryDrawing Brush="#FF00539C" Geometry="F1M8,10L5,10 5,8.969 8,9z" />
-            </DrawingGroup.Children>
-          </DrawingGroup>
-        </DrawingBrush.Drawing>
-      </DrawingBrush>
-    </Rectangle.Fill>
-  </Rectangle>
-</Viewbox>
+<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="F1M15,10L13,10 13,12 11,12 11,14 2,14 2,5 4,5 4,3 6,3 6,1 15,1z" />
+    <GeometryDrawing Brush="#FF424242" Geometry="F1M9,7L4,7 4,12 9,12z M10,13L3,13 3,6 10,6z M5,4L5,5 6,5 11,5 11,10 11,11 12,11 12,4z M14,2L14,9 13,9 13,8 13,3 8,3 7,3 7,2z" />
+    <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M8,10L5,10 5,9 8,9z M4,12L9,12 9,7 4,7z" />
+    <GeometryDrawing Brush="#FF00539C" Geometry="F1M8,10L5,10 5,8.969 8,9z" />
+  </DrawingGroup.Children>
+</DrawingGroup>
--- a/ILSpy/Images/Forward.xaml
+++ b/ILSpy/Images/Forward.xaml
@ -1,20 +1,10 @@
				@@ -1,20 +1,10 @@
 <!-- This file was generated by the AiToXaml tool.-->
 <!-- Tool Version: 14.0.22307.0 -->
-<Viewbox Width="16" Height="16" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-  <Rectangle Width="16" Height="16">
-    <Rectangle.Fill>
-      <DrawingBrush>
-        <DrawingBrush.Drawing>
-          <DrawingGroup>
-            <DrawingGroup.Children>
-              <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
-              <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M15,8C15,11.866 11.866,15 8,15 4.134,15 1,11.866 1,8 1,4.134 4.134,1 8,1 11.866,1 15,4.134 15,8" />
-              <GeometryDrawing Brush="#FF00539C" Geometry="F1M9,11L7,11 9,9 4,9 4,7 9,7 7,5 9,5 12,8z M8,2C4.755,2 2,4.756 2,8 2,11.247 4.755,14 8,14 11.245,14 14,11.247 14,8 14,4.756 11.245,2 8,2" />
-              <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M9,11L7,11 9,9 4,9 4,7 9,7 7,5 9,5 12,8z" />
-            </DrawingGroup.Children>
-          </DrawingGroup>
-        </DrawingBrush.Drawing>
-      </DrawingBrush>
-    </Rectangle.Fill>
-  </Rectangle>
-</Viewbox>
+<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="F1M15,8C15,11.866 11.866,15 8,15 4.134,15 1,11.866 1,8 1,4.134 4.134,1 8,1 11.866,1 15,4.134 15,8" />
+    <GeometryDrawing Brush="#FF00539C" Geometry="F1M9,11L7,11 9,9 4,9 4,7 9,7 7,5 9,5 12,8z M8,2C4.755,2 2,4.756 2,8 2,11.247 4.755,14 8,14 11.245,14 14,11.247 14,8 14,4.756 11.245,2 8,2" />
+    <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M9,11L7,11 9,9 4,9 4,7 9,7 7,5 9,5 12,8z" />
+  </DrawingGroup.Children>
+</DrawingGroup>
--- a/ILSpy/Images/Images.cs
+++ b/ILSpy/Images/Images.cs
@ -37,100 +37,89 @@ namespace ICSharpCode.ILSpy
				@@ -37,100 +37,89 @@ namespace ICSharpCode.ILSpy
 			return image;
 		}

-		static object Load(string icon)
+		static ImageSource Load(string icon)
 		{
 			icon = "Images/" + icon;
 			if (icon.EndsWith(".png", StringComparison.OrdinalIgnoreCase))
 				return LoadImage(null, icon);
 			Uri uri = GetUri(null, icon + ".xaml");
 			if (ResourceExists(uri)) {
-				return LoadDrawingGroup(null, icon);
+				return new DrawingImage(LoadDrawingGroup(null, icon));
 			}
 			return LoadImage(null, icon + ".png");
 		}

-		public static readonly BitmapImage Breakpoint = LoadBitmap("Breakpoint");
-		public static readonly BitmapImage CurrentLine = LoadBitmap("CurrentLine");
+		public static readonly ImageSource Breakpoint = LoadBitmap("Breakpoint");
+		public static readonly ImageSource CurrentLine = LoadBitmap("CurrentLine");

-		public static readonly BitmapImage ViewCode = LoadBitmap("ViewCode");
-		public static readonly BitmapImage Save = LoadBitmap("SaveFile");
-		public static readonly BitmapImage OK = LoadBitmap("OK");
+		public static readonly ImageSource ViewCode = LoadBitmap("ViewCode");
+		public static readonly ImageSource Save = LoadBitmap("SaveFile");
+		public static readonly ImageSource OK = LoadBitmap("OK");

-		public static readonly BitmapImage Delete = LoadBitmap("Delete");
-		public static readonly BitmapImage Search = LoadBitmap("Search");
+		public static readonly ImageSource Delete = LoadBitmap("Delete");
+		public static readonly ImageSource Search = LoadBitmap("Search");

-		public static readonly object Assembly = Load("Assembly");
-		public static readonly object AssemblyWarning = Load("AssemblyWarning");
-		public static readonly object AssemblyLoading = Load("FindAssembly");
+		public static readonly ImageSource Assembly = Load("Assembly");
+		public static readonly ImageSource AssemblyWarning = Load("AssemblyWarning");
+		public static readonly ImageSource AssemblyLoading = Load("FindAssembly");

-		public static readonly object Library = Load("Library");
-		public static readonly object Namespace = Load("Namespace");
+		public static readonly ImageSource Library = Load("Library");
+		public static readonly ImageSource Namespace = Load("Namespace");

-		public static readonly object ReferenceFolder = Load("ReferenceFolder");
+		public static readonly ImageSource ReferenceFolder = Load("ReferenceFolder");

-		public static readonly object SubTypes = Load("SubTypes");
-		public static readonly object SuperTypes = Load("SuperTypes");
+		public static readonly ImageSource SubTypes = Load("SubTypes");
+		public static readonly ImageSource SuperTypes = Load("SuperTypes");

-		public static readonly object FolderOpen = Load("Folder.Open");
-		public static readonly object FolderClosed = Load("Folder.Closed");
+		public static readonly ImageSource FolderOpen = Load("Folder.Open");
+		public static readonly ImageSource FolderClosed = Load("Folder.Closed");

-		public static readonly object Resource = Load("Resource");
-		public static readonly object ResourceImage = Load("ResourceImage");
-		public static readonly object ResourceResourcesFile = Load("ResourceResourcesFile");
-		public static readonly object ResourceXml = Load("ResourceXml");
-		public static readonly object ResourceXsd = Load("ResourceXslt");
-		public static readonly object ResourceXslt = Load("ResourceXslt");
+		public static readonly ImageSource Resource = Load("Resource");
+		public static readonly ImageSource ResourceImage = Load("ResourceImage");
+		public static readonly ImageSource ResourceResourcesFile = Load("ResourceResourcesFile");
+		public static readonly ImageSource ResourceXml = Load("ResourceXml");
+		public static readonly ImageSource ResourceXsd = Load("ResourceXslt");
+		public static readonly ImageSource ResourceXslt = Load("ResourceXslt");

-		public static readonly object Class = Load("Class");
-		public static readonly object Struct = Load("Struct");
-		public static readonly object Interface = Load("Interface");
-		public static readonly object Delegate = Load("Delegate");
-		public static readonly object Enum = Load("Enum");
+		public static readonly ImageSource Class = Load("Class");
+		public static readonly ImageSource Struct = Load("Struct");
+		public static readonly ImageSource Interface = Load("Interface");
+		public static readonly ImageSource Delegate = Load("Delegate");
+		public static readonly ImageSource Enum = Load("Enum");

-		public static readonly object Field = Load("Field");
-		public static readonly object FieldReadOnly = Load("Field");
-		public static readonly object Literal = Load("Literal");
-		public static readonly object EnumValue = Load("EnumValue");
+		public static readonly ImageSource Field = Load("Field");
+		public static readonly ImageSource FieldReadOnly = Load("Field");
+		public static readonly ImageSource Literal = Load("Literal");
+		public static readonly ImageSource EnumValue = Load("EnumValue");

-		public static readonly object Method = Load("Method");
-		public static readonly object Constructor = Load("Method");
-		public static readonly object VirtualMethod = Load("Method");
-		public static readonly object Operator = Load("Operator");
-		public static readonly object ExtensionMethod = Load("ExtensionMethod");
-		public static readonly object PInvokeMethod = Load("Method");
+		public static readonly ImageSource Method = Load("Method");
+		public static readonly ImageSource Constructor = Load("Method");
+		public static readonly ImageSource VirtualMethod = Load("Method");
+		public static readonly ImageSource Operator = Load("Operator");
+		public static readonly ImageSource ExtensionMethod = Load("ExtensionMethod");
+		public static readonly ImageSource PInvokeMethod = Load("Method");

-		public static readonly object Property = Load("Property");
-		public static readonly object Indexer = Load("Indexer");
+		public static readonly ImageSource Property = Load("Property");
+		public static readonly ImageSource Indexer = Load("Indexer");

-		public static readonly object Event = Load("Event");
+		public static readonly ImageSource Event = Load("Event");

-		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 object OverlayPrivateProtected = Load("OverlayPrivateProtected");
-		private static readonly object OverlayCompilerControlled = Load("OverlayCompilerControlled");
+		private static readonly ImageSource OverlayProtected = Load("OverlayProtected");
+		private static readonly ImageSource OverlayInternal = Load("OverlayInternal");
+		private static readonly ImageSource OverlayProtectedInternal = Load("OverlayProtectedInternal");
+		private static readonly ImageSource OverlayPrivate = Load("OverlayPrivate");
+		private static readonly ImageSource OverlayPrivateProtected = Load("OverlayPrivateProtected");
+		private static readonly ImageSource OverlayCompilerControlled = Load("OverlayCompilerControlled");

-		private static readonly object OverlayStatic = Load("OverlayStatic");
+		private static readonly ImageSource OverlayStatic = Load("OverlayStatic");

-		public static object GetIcon(object imageOrVector)
-		{
-			if (imageOrVector is BitmapImage img)
-				return img;
-			return new Rectangle {
-				Width = 16,
-				Height = 16,
-				Fill = new DrawingBrush((DrawingGroup)imageOrVector)
-			};
-		}
-
-		public static object Load(object part, string icon)
+		public static ImageSource Load(object part, string icon)
 		{
 			if (icon.EndsWith(".png", StringComparison.OrdinalIgnoreCase))
 				return LoadImage(part, icon);
 			Uri uri = GetUri(part, icon + ".xaml");
 			if (ResourceExists(uri)) {
-				return LoadVector(part, icon);
+				return new DrawingImage(LoadDrawingGroup(part, icon));
 			}
 			return LoadImage(part, icon + ".png");
 		}
@ -143,14 +132,9 @@ namespace ICSharpCode.ILSpy
				@@ -143,14 +132,9 @@ namespace ICSharpCode.ILSpy
 			return image;
 		}

-		public static Viewbox LoadVector(object part, string icon)
-		{
-			return (Viewbox)Application.LoadComponent(GetUri(part, icon + ".xaml", absolute: false));
-		}
-
-		public static DrawingGroup LoadDrawingGroup(object part, string icon)
+		public static Drawing LoadDrawingGroup(object part, string icon)
 		{
-			return (DrawingGroup)Application.LoadComponent(GetUri(part, icon + ".xaml", absolute: false));
+			return (Drawing)Application.LoadComponent(GetUri(part, icon + ".xaml", absolute: false));
 		}

 		private static Uri GetUri(object part, string icon, bool absolute = true)
@ -189,13 +173,13 @@ namespace ICSharpCode.ILSpy
				@@ -189,13 +173,13 @@ namespace ICSharpCode.ILSpy
 		private static readonly TypeIconCache typeIconCache = new TypeIconCache();
 		private static readonly MemberIconCache memberIconCache = new MemberIconCache();

-		public static object GetIcon(TypeIcon icon, AccessOverlayIcon overlay, bool isStatic = false)
+		public static ImageSource GetIcon(TypeIcon icon, AccessOverlayIcon overlay, bool isStatic = false)
 		{
 			lock (typeIconCache)
 				return typeIconCache.GetIcon(icon, overlay, isStatic);
 		}

-		public static object GetIcon(MemberIcon icon, AccessOverlayIcon overlay, bool isStatic)
+		public static ImageSource GetIcon(MemberIcon icon, AccessOverlayIcon overlay, bool isStatic)
 		{
 			lock (memberIconCache)
 				return memberIconCache.GetIcon(icon, overlay, isStatic);
@ -214,9 +198,9 @@ namespace ICSharpCode.ILSpy
				@@ -214,9 +198,9 @@ namespace ICSharpCode.ILSpy
 				PreloadPublicIconToCache(TypeIcon.Delegate, Images.Delegate);
 			}

-			protected override object GetBaseImage(TypeIcon icon)
+			protected override ImageSource GetBaseImage(TypeIcon icon)
 			{
-				object baseImage;
+				ImageSource baseImage;
 				switch (icon) {
 					case TypeIcon.Class:
 						baseImage = Images.Class;
@ -260,9 +244,9 @@ namespace ICSharpCode.ILSpy
				@@ -260,9 +244,9 @@ namespace ICSharpCode.ILSpy
 				PreloadPublicIconToCache(MemberIcon.Event, Images.Event);
 			}

-			protected override object GetBaseImage(MemberIcon icon)
+			protected override ImageSource GetBaseImage(MemberIcon icon)
 			{
-				object baseImage;
+				ImageSource baseImage;
 				switch (icon) {
 					case MemberIcon.Field:
 						baseImage = Images.Field;
@ -313,42 +297,39 @@ namespace ICSharpCode.ILSpy
				@@ -313,42 +297,39 @@ namespace ICSharpCode.ILSpy

 		private abstract class IconCache<T>
 		{
-			private readonly Dictionary<(T, AccessOverlayIcon, bool), object> cache = new Dictionary<(T, AccessOverlayIcon, bool), object>();
+			private readonly Dictionary<(T, AccessOverlayIcon, bool), ImageSource> cache = new Dictionary<(T, AccessOverlayIcon, bool), ImageSource>();

-			protected void PreloadPublicIconToCache(T icon, object image)
+			protected void PreloadPublicIconToCache(T icon, ImageSource image)
 			{
 				var iconKey = (icon, AccessOverlayIcon.Public, false);
-				if (image is ImageSource img)
-					cache.Add(iconKey, img);
-				else
-					cache.Add(iconKey, new DrawingImage((DrawingGroup)image));
+				cache.Add(iconKey, image);
 			}

-			public object GetIcon(T icon, AccessOverlayIcon overlay, bool isStatic)
+			public ImageSource GetIcon(T icon, AccessOverlayIcon overlay, bool isStatic)
 			{
 				var iconKey = (icon, overlay, isStatic);
 				if (cache.ContainsKey(iconKey)) {
 					return cache[iconKey];
 				} else {
-					object result = BuildMemberIcon(icon, overlay, isStatic);
+					ImageSource result = BuildMemberIcon(icon, overlay, isStatic);
 					cache.Add(iconKey, result);
 					return result;
 				}
 			}

-			private object BuildMemberIcon(T icon, AccessOverlayIcon overlay, bool isStatic)
+			private ImageSource BuildMemberIcon(T icon, AccessOverlayIcon overlay, bool isStatic)
 			{
-				object baseImage = GetBaseImage(icon);
-				object overlayImage = GetOverlayImage(overlay);
+				ImageSource baseImage = GetBaseImage(icon);
+				ImageSource overlayImage = GetOverlayImage(overlay);

 				return CreateOverlayImage(baseImage, overlayImage, isStatic);
 			}

-			protected abstract object GetBaseImage(T icon);
+			protected abstract ImageSource GetBaseImage(T icon);

-			private static object GetOverlayImage(AccessOverlayIcon overlay)
+			private static ImageSource GetOverlayImage(AccessOverlayIcon overlay)
 			{
-				object overlayImage;
+				ImageSource overlayImage;
 				switch (overlay) {
 					case AccessOverlayIcon.Public:
 						overlayImage = null;
@ -379,16 +360,11 @@ namespace ICSharpCode.ILSpy
				@@ -379,16 +360,11 @@ namespace ICSharpCode.ILSpy

 			private static readonly Rect iconRect = new Rect(0, 0, 16, 16);

-			private static ImageSource CreateOverlayImage(object baseImage, object overlay, bool isStatic)
+			private static ImageSource CreateOverlayImage(ImageSource baseImage, ImageSource overlay, bool isStatic)
 			{
 				var group = new DrawingGroup();

-				Drawing baseDrawing;
-				if (baseImage is ImageSource img) {
-					baseDrawing = new ImageDrawing(img, iconRect);
-				} else {
-					baseDrawing = (DrawingGroup)baseImage;
-				}
+				Drawing baseDrawing = new ImageDrawing(baseImage, iconRect);

 				if (overlay != null || isStatic) {
 					var nestedGroup = new DrawingGroup { Transform = new ScaleTransform(0.8, 0.8) };
@ -399,17 +375,11 @@ namespace ICSharpCode.ILSpy
				@@ -399,17 +375,11 @@ namespace ICSharpCode.ILSpy
 				}

 				if (overlay != null) {
-					if (overlay is ImageSource overlayImage)
-						group.Children.Add(new ImageDrawing(overlayImage, iconRect));
-					else
-						group.Children.Add((DrawingGroup)overlay);
+					group.Children.Add(new ImageDrawing(overlay, iconRect));
 				}

 				if (isStatic) {
-					if (Images.OverlayStatic is ImageSource staticImg)
-						group.Children.Add(new ImageDrawing(staticImg, iconRect));
-					else
-						group.Children.Add((DrawingGroup)Images.OverlayStatic);
+					group.Children.Add(new ImageDrawing(Images.OverlayStatic, iconRect));
 				}

 				var image = new DrawingImage(group);
--- a/ILSpy/Images/Open.xaml
+++ b/ILSpy/Images/Open.xaml
@ -1,20 +1,10 @@
				@@ -1,20 +1,10 @@
 <!-- This file was generated by the AiToXaml tool.-->
 <!-- Tool Version: 14.0.22307.0 -->
-<Viewbox Width="16" Height="16" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-  <Rectangle Width="16" Height="16">
-    <Rectangle.Fill>
-      <DrawingBrush>
-        <DrawingBrush.Drawing>
-          <DrawingGroup>
-            <DrawingGroup.Children>
-              <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
-              <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M16,9L16,10.196 13.677,16 2,16C2,16 1.14,15.979 0.57,15.435 0.227,15.103 0,14.617 0,14L0,5C0,3.697,1.005,3,2,3L4.486,3 3.607,2.121 5.729,0 10.246,4.518 9.999,4.765 10.116,5 13,5C13.97,5,15,5.701,15,7L15,9z" />
-              <GeometryDrawing Brush="#FFDCB67A" Geometry="F1M14,10.0313L14,7.0313C14,6.0313,12.764,6.0313,13,6.0313L9.5,6.0313 9.244,5.5193 8.578,6.1863 9,7.0313 13,7.0313 13,10.0313 4,10.0313 2,15.0313 13,15.0313 15,10.0313z M2,15.0153L1.997,15.0153C1.94,15.0153,1,15.0013,1,14.0313L1,8.9593C1.286,9.2523,1.626,9.4873,2,9.6663z" />
-              <GeometryDrawing Brush="#FF00529C" Geometry="F1M8.832,4.5176L5.728,7.6216 5.021,6.9136 6.918,5.0176 3.5,5.0176C2.673,5.0176 2,5.6906 2,6.5176 2,7.3446 2.673,8.0176 3.5,8.0176L3.5,9.0176C2.122,9.0176 1,7.8966 1,6.5176 1,5.1396 2.122,4.0176 3.5,4.0176L6.918,4.0176 5.021,2.1216 5.728,1.4136z" />
-            </DrawingGroup.Children>
-          </DrawingGroup>
-        </DrawingBrush.Drawing>
-      </DrawingBrush>
-    </Rectangle.Fill>
-  </Rectangle>
-</Viewbox>
+<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="F1M16,9L16,10.196 13.677,16 2,16C2,16 1.14,15.979 0.57,15.435 0.227,15.103 0,14.617 0,14L0,5C0,3.697,1.005,3,2,3L4.486,3 3.607,2.121 5.729,0 10.246,4.518 9.999,4.765 10.116,5 13,5C13.97,5,15,5.701,15,7L15,9z" />
+    <GeometryDrawing Brush="#FFDCB67A" Geometry="F1M14,10.0313L14,7.0313C14,6.0313,12.764,6.0313,13,6.0313L9.5,6.0313 9.244,5.5193 8.578,6.1863 9,7.0313 13,7.0313 13,10.0313 4,10.0313 2,15.0313 13,15.0313 15,10.0313z M2,15.0153L1.997,15.0153C1.94,15.0153,1,15.0013,1,14.0313L1,8.9593C1.286,9.2523,1.626,9.4873,2,9.6663z" />
+    <GeometryDrawing Brush="#FF00529C" Geometry="F1M8.832,4.5176L5.728,7.6216 5.021,6.9136 6.918,5.0176 3.5,5.0176C2.673,5.0176 2,5.6906 2,6.5176 2,7.3446 2.673,8.0176 3.5,8.0176L3.5,9.0176C2.122,9.0176 1,7.8966 1,6.5176 1,5.1396 2.122,4.0176 3.5,4.0176L6.918,4.0176 5.021,2.1216 5.728,1.4136z" />
+  </DrawingGroup.Children>
+</DrawingGroup>
--- a/ILSpy/Images/Refresh.xaml
+++ b/ILSpy/Images/Refresh.xaml
@ -1,19 +1,9 @@
				@@ -1,19 +1,9 @@
 <!-- This file was generated by the AiToXaml tool.-->
 <!-- Tool Version: 14.0.22307.0 -->
-<Viewbox Width="16" Height="16" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-  <Rectangle Width="16" Height="16">
-    <Rectangle.Fill>
-      <DrawingBrush>
-        <DrawingBrush.Drawing>
-          <DrawingGroup>
-            <DrawingGroup.Children>
-              <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
-              <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M16,8C16,12.411 12.411,16 8,16 3.589,16 0,12.411 0,8 0,6.597 0.384,5.212 1.088,4L0,4 0,0 8,0 8,8 4,8C4,10.206 5.794,12 8,12 10.206,12 12,10.206 12,8 12,6.656 11.331,5.41 10.21,4.666L9.377,4.112 11.592,0.78 12.425,1.333C14.663,2.822,16,5.314,16,8" />
-              <GeometryDrawing Brush="#FF00529C" Geometry="F1M15,8C15,11.859 11.859,15 8,15 4.14,15 1,11.859 1,8 1,6.076 1.801,4.292 3.121,3L1,3 1,1 7,1 7,7 5,7 5,4.002C3.766,4.931 3,6.401 3,8 3,10.757 5.243,13 8,13 10.757,13 13,10.757 13,8 13,6.321 12.164,4.763 10.764,3.833L11.871,2.167C13.83,3.469,15,5.649,15,8" />
-            </DrawingGroup.Children>
-          </DrawingGroup>
-        </DrawingBrush.Drawing>
-      </DrawingBrush>
-    </Rectangle.Fill>
-  </Rectangle>
-</Viewbox>
+<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="F1M16,8C16,12.411 12.411,16 8,16 3.589,16 0,12.411 0,8 0,6.597 0.384,5.212 1.088,4L0,4 0,0 8,0 8,8 4,8C4,10.206 5.794,12 8,12 10.206,12 12,10.206 12,8 12,6.656 11.331,5.41 10.21,4.666L9.377,4.112 11.592,0.78 12.425,1.333C14.663,2.822,16,5.314,16,8" />
+    <GeometryDrawing Brush="#FF00529C" Geometry="F1M15,8C15,11.859 11.859,15 8,15 4.14,15 1,11.859 1,8 1,6.076 1.801,4.292 3.121,3L1,3 1,1 7,1 7,7 5,7 5,4.002C3.766,4.931 3,6.401 3,8 3,10.757 5.243,13 8,13 10.757,13 13,10.757 13,8 13,6.321 12.164,4.763 10.764,3.833L11.871,2.167C13.83,3.469,15,5.649,15,8" />
+  </DrawingGroup.Children>
+</DrawingGroup>
--- a/ILSpy/Images/Save.xaml
+++ b/ILSpy/Images/Save.xaml
@ -1,20 +1,10 @@
				@@ -1,20 +1,10 @@
 <!-- This file was generated by the AiToXaml tool.-->
 <!-- Tool Version: 14.0.22307.0 -->
-<Viewbox Width="16" Height="16" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-  <Rectangle Width="16" Height="16">
-    <Rectangle.Fill>
-      <DrawingBrush>
-        <DrawingBrush.Drawing>
-          <DrawingGroup>
-            <DrawingGroup.Children>
-              <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
-              <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M16,2L16,16 2.586,16 0,13.414 0,2C0,0.897,0.897,0,2,0L14,0C15.103,0,16,0.897,16,2" />
-              <GeometryDrawing Brush="#FFEFEFF0" Geometry="F1M4,10L4,15 6,15 6,12 8,12 8,15 12,15 12,10z M13,7L3,7 3,3 13,3z" />
-              <GeometryDrawing Brush="#FF00529C" Geometry="F1M13,3L3,3 3,7 13,7z M15,2L15,15 12,15 12,10 4,10 4,15 3,15 1,13 1,2C1,1.448,1.448,1,2,1L14,1C14.553,1,15,1.448,15,2 M6,12L8,12 8,15 6,15z" />
-            </DrawingGroup.Children>
-          </DrawingGroup>
-        </DrawingBrush.Drawing>
-      </DrawingBrush>
-    </Rectangle.Fill>
-  </Rectangle>
-</Viewbox>
+<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="F1M16,2L16,16 2.586,16 0,13.414 0,2C0,0.897,0.897,0,2,0L14,0C15.103,0,16,0.897,16,2" />
+    <GeometryDrawing Brush="#FFEFEFF0" Geometry="F1M4,10L4,15 6,15 6,12 8,12 8,15 12,15 12,10z M13,7L3,7 3,3 13,3z" />
+    <GeometryDrawing Brush="#FF00529C" Geometry="F1M13,3L3,3 3,7 13,7z M15,2L15,15 12,15 12,10 4,10 4,15 3,15 1,13 1,2C1,1.448,1.448,1,2,1L14,1C14.553,1,15,1.448,15,2 M6,12L8,12 8,15 6,15z" />
+  </DrawingGroup.Children>
+</DrawingGroup>
--- a/ILSpy/Images/Search.xaml
+++ b/ILSpy/Images/Search.xaml
@ -1,20 +1,10 @@
				@@ -1,20 +1,10 @@
 <!-- This file was generated by the AiToXaml tool.-->
 <!-- Tool Version: 14.0.22307.0 -->
-<Viewbox Width="16" Height="16" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-  <Rectangle Width="16" Height="16">
-    <Rectangle.Fill>
-      <DrawingBrush>
-        <DrawingBrush.Drawing>
-          <DrawingGroup>
-            <DrawingGroup.Children>
-              <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
-              <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M16,5.8335C16,9.0495 13.384,11.6665 10.167,11.6665 9.136,11.6665 8.144,11.3925 7.254,10.8675L2.561,15.5605C2.277,15.8435 1.9,16.0005 1.5,16.0005 1.1,16.0005 0.723000000000001,15.8435 0.439,15.5605 -0.146000000000001,14.9755 -0.146000000000001,14.0245 0.439,13.4395L5.133,8.7445C4.608,7.8555 4.333,6.8635 4.333,5.8335 4.333,2.6165 6.95,0.000500000000000611 10.167,0.000500000000000611 13.384,0.000500000000000611 16,2.6165 16,5.8335" />
-              <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M14,5.8335C14,7.9475 12.28,9.6665 10.167,9.6665 8.053,9.6665 6.333,7.9475 6.333,5.8335 6.333,3.7195 8.053,2.0005 10.167,2.0005 12.28,2.0005 14,3.7195 14,5.8335" />
-              <GeometryDrawing Brush="#FF424242" Geometry="F1M10.167,9.667C8.053,9.667 6.334,7.947 6.334,5.834 6.334,3.72 8.053,2 10.167,2 12.28,2 14,3.72 14,5.834 14,7.947 12.28,9.667 10.167,9.667 M10.167,1C7.502,1 5.334,3.168 5.334,5.834 5.334,6.985 5.755,8.03 6.431,8.862L1.147,14.146C0.951000000000001,14.342 0.951000000000001,14.658 1.147,14.854 1.244,14.951 1.372,15 1.5,15 1.628,15 1.756,14.951 1.854,14.854L7.138,9.569C7.969,10.245 9.015,10.667 10.167,10.667 12.832,10.667 15,8.499 15,5.834 15,3.168 12.832,1 10.167,1" />
-            </DrawingGroup.Children>
-          </DrawingGroup>
-        </DrawingBrush.Drawing>
-      </DrawingBrush>
-    </Rectangle.Fill>
-  </Rectangle>
-</Viewbox>
+<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="F1M16,5.8335C16,9.0495 13.384,11.6665 10.167,11.6665 9.136,11.6665 8.144,11.3925 7.254,10.8675L2.561,15.5605C2.277,15.8435 1.9,16.0005 1.5,16.0005 1.1,16.0005 0.723000000000001,15.8435 0.439,15.5605 -0.146000000000001,14.9755 -0.146000000000001,14.0245 0.439,13.4395L5.133,8.7445C4.608,7.8555 4.333,6.8635 4.333,5.8335 4.333,2.6165 6.95,0.000500000000000611 10.167,0.000500000000000611 13.384,0.000500000000000611 16,2.6165 16,5.8335" />
+    <GeometryDrawing Brush="#FFF0EFF1" Geometry="F1M14,5.8335C14,7.9475 12.28,9.6665 10.167,9.6665 8.053,9.6665 6.333,7.9475 6.333,5.8335 6.333,3.7195 8.053,2.0005 10.167,2.0005 12.28,2.0005 14,3.7195 14,5.8335" />
+    <GeometryDrawing Brush="#FF424242" Geometry="F1M10.167,9.667C8.053,9.667 6.334,7.947 6.334,5.834 6.334,3.72 8.053,2 10.167,2 12.28,2 14,3.72 14,5.834 14,7.947 12.28,9.667 10.167,9.667 M10.167,1C7.502,1 5.334,3.168 5.334,5.834 5.334,6.985 5.755,8.03 6.431,8.862L1.147,14.146C0.951000000000001,14.342 0.951000000000001,14.658 1.147,14.854 1.244,14.951 1.372,15 1.5,15 1.628,15 1.756,14.951 1.854,14.854L7.138,9.569C7.969,10.245 9.015,10.667 10.167,10.667 12.832,10.667 15,8.499 15,5.834 15,3.168 12.832,1 10.167,1" />
+  </DrawingGroup.Children>
+</DrawingGroup>
--- a/ILSpy/Images/Sort.xaml
+++ b/ILSpy/Images/Sort.xaml
@ -1,21 +1,11 @@
				@@ -1,21 +1,11 @@
 <!-- This file was generated by the AiToXaml tool.-->
 <!-- Tool Version: 14.0.22307.0 -->
-<Viewbox Width="16" Height="16" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
-  <Rectangle Width="16" Height="16">
-    <Rectangle.Fill>
-      <DrawingBrush>
-        <DrawingBrush.Drawing>
-          <DrawingGroup>
-            <DrawingGroup.Children>
-              <GeometryDrawing Brush="#00FFFFFF" Geometry="F1M16,16L0,16 0,0 16,0z" />
-              <GeometryDrawing Brush="#FFF6F6F6" Geometry="F1M0,-0.000199999999999534L0,8.9998 1,8.9998 1,12.0008 2.586,12.0008 1,13.5858 1,15.9998 8,15.9998 8,13.0008 6.449,13.0008 8,12.0008 8,10.9998 12,14.9998 16,10.9998 16,4.9998 14,6.9998 14,3.0008 10,3.0008 10,6.9998 9,5.9998 9,-0.000199999999999534z" />
-              <GeometryDrawing Brush="#FF424242" Geometry="F1M7,7L5,2 4,2 2,7 3,7 3.399,6 5.601,6 6,7z M8,8L1,8 1,1 8,1z M4.5,3.25L5.2,5 3.8,5z M2,11L5,11 2,14 2,15 7,15 7,14 4.013,14 7,11.051 6.952,11 7,11 7,10 2,10z" />
-              <GeometryDrawing Brush="#FFEFEFF0" Geometry="F1M3.7998,5L4.4998,3.25 5.1998,5z M5.9998,7L6.9998,7 4.9998,2 3.9998,2 1.9998,7 2.9998,7 3.3998,6 5.6008,6z" />
-              <GeometryDrawing Brush="#FF00529C" Geometry="F1M15,8L15,10 12,13 9,10 9,8 11,10 11,4 13,4 13,10z" />
-            </DrawingGroup.Children>
-          </DrawingGroup>
-        </DrawingBrush.Drawing>
-      </DrawingBrush>
-    </Rectangle.Fill>
-  </Rectangle>
-</Viewbox>
+<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="F1M0,-0.000199999999999534L0,8.9998 1,8.9998 1,12.0008 2.586,12.0008 1,13.5858 1,15.9998 8,15.9998 8,13.0008 6.449,13.0008 8,12.0008 8,10.9998 12,14.9998 16,10.9998 16,4.9998 14,6.9998 14,3.0008 10,3.0008 10,6.9998 9,5.9998 9,-0.000199999999999534z" />
+    <GeometryDrawing Brush="#FF424242" Geometry="F1M7,7L5,2 4,2 2,7 3,7 3.399,6 5.601,6 6,7z M8,8L1,8 1,1 8,1z M4.5,3.25L5.2,5 3.8,5z M2,11L5,11 2,14 2,15 7,15 7,14 4.013,14 7,11.051 6.952,11 7,11 7,10 2,10z" />
+    <GeometryDrawing Brush="#FFEFEFF0" Geometry="F1M3.7998,5L4.4998,3.25 5.1998,5z M5.9998,7L6.9998,7 4.9998,2 3.9998,2 1.9998,7 2.9998,7 3.3998,6 5.6008,6z" />
+    <GeometryDrawing Brush="#FF00529C" Geometry="F1M15,8L15,10 12,13 9,10 9,8 11,10 11,4 13,4 13,10z" />
+  </DrawingGroup.Children>
+</DrawingGroup>
--- a/ILSpy/Search/AbstractSearchStrategy.cs
+++ b/ILSpy/Search/AbstractSearchStrategy.cs
@ -157,9 +157,7 @@ namespace ICSharpCode.ILSpy.Search
				@@ -157,9 +157,7 @@ namespace ICSharpCode.ILSpy.Search
 			return new SearchResult {
 				Member = item,
 				Fitness = CalculateFitness(item),
-				Image = GetIcon(item),
 				Name = GetLanguageSpecificName(item),
-				LocationImage = declaringType != null ? TypeTreeNode.GetIcon(declaringType) : Images.Namespace,
 				Location = declaringType != null ? language.TypeToString(declaringType, includeNamespace: true) : item.Namespace,
 				ToolTip = item.ParentModule.PEFile?.FileName
 			};
@ -204,7 +202,7 @@ namespace ICSharpCode.ILSpy.Search
				@@ -204,7 +202,7 @@ namespace ICSharpCode.ILSpy.Search
 			}
 		}

-		object GetIcon(IEntity member)
+		internal static object GetIcon(IEntity member)
 		{
 			switch (member) {
 				case ITypeDefinition t:
--- a/ILSpy/Search/SearchPane.cs
+++ b/ILSpy/Search/SearchPane.cs
@ -373,22 +373,41 @@ namespace ICSharpCode.ILSpy
				@@ -373,22 +373,41 @@ namespace ICSharpCode.ILSpy

 	public sealed class SearchResult : IMemberTreeNode
 	{
-		public static readonly System.Collections.Generic.IComparer<SearchResult> Comparer = new SearchResultComparer();
-		
+		object image;
+		object locationImage;
+
+		public static readonly IComparer<SearchResult> Comparer = new SearchResultComparer();
+
 		public IEntity Member { get; set; }
 		public float Fitness { get; set; }
-		
+
 		public string Location { get; set; }
 		public string Name { get; set; }
 		public object ToolTip { get; set; }
-		public object Image { get; set; }
-		public object LocationImage { get; set; }
-		
+
+		public object Image {
+			get {
+				if (image == null) {
+					image = AbstractSearchStrategy.GetIcon(Member);
+				}
+				return image;
+			}
+		}
+
+		public object LocationImage {
+			get {
+				if (locationImage == null) {
+					locationImage = Member.DeclaringTypeDefinition != null ? TypeTreeNode.GetIcon(Member.DeclaringTypeDefinition) : Images.Namespace;
+				}
+				return locationImage;
+			}
+		}
+
 		public override string ToString()
 		{
 			return Name;
 		}
-		
+
 		class SearchResultComparer : System.Collections.Generic.IComparer<SearchResult>
 		{
 			public int Compare(SearchResult x, SearchResult y)
--- a/ILSpy/TreeNodes/AssemblyReferenceTreeNode.cs
+++ b/ILSpy/TreeNodes/AssemblyReferenceTreeNode.cs
@ -43,7 +43,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
				@@ -43,7 +43,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			get { return r.Name + ((System.Reflection.Metadata.EntityHandle)r.Handle).ToSuffixString(); }
 		}

-		public override object Icon => Images.GetIcon(Images.Assembly);
+		public override object Icon => Images.Assembly;

 		public override bool ShowExpander {
 			get {
--- a/ILSpy/TreeNodes/AssemblyTreeNode.cs
+++ b/ILSpy/TreeNodes/AssemblyTreeNode.cs
@ -70,9 +70,9 @@ namespace ICSharpCode.ILSpy.TreeNodes
				@@ -70,9 +70,9 @@ namespace ICSharpCode.ILSpy.TreeNodes
 		public override object Icon {
 			get {
 				if (LoadedAssembly.IsLoaded) {
-					return LoadedAssembly.HasLoadError ? Images.GetIcon(Images.AssemblyWarning) : Images.GetIcon(Images.Assembly);
+					return LoadedAssembly.HasLoadError ? Images.AssemblyWarning : Images.Assembly;
 				} else {
-					return Images.GetIcon(Images.AssemblyLoading);
+					return Images.AssemblyLoading;
 				}
 			}
 		}
--- a/ILSpy/TreeNodes/BaseTypesEntryNode.cs
+++ b/ILSpy/TreeNodes/BaseTypesEntryNode.cs
@ -70,7 +70,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
				@@ -70,7 +70,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 		public override object Text => this.Language.TypeToString(type, includeNamespace: true) + handle.ToSuffixString();

 		public override object Icon => 
-			isInterface ? Images.GetIcon(Images.Interface) : Images.GetIcon(Images.Class);
+			isInterface ? Images.Interface : Images.Class;

 		protected override void LoadChildren()
 		{
--- a/ILSpy/TreeNodes/BaseTypesTreeNode.cs
+++ b/ILSpy/TreeNodes/BaseTypesTreeNode.cs
@ -44,7 +44,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
				@@ -44,7 +44,7 @@ namespace ICSharpCode.ILSpy.TreeNodes

 		public override object Text => "Base Types";

-		public override object Icon => Images.GetIcon(Images.SuperTypes);
+		public override object Icon => Images.SuperTypes;

 		protected override void LoadChildren()
 		{
--- a/ILSpy/TreeNodes/DerivedTypesTreeNode.cs
+++ b/ILSpy/TreeNodes/DerivedTypesTreeNode.cs
@ -46,7 +46,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
				@@ -46,7 +46,7 @@ namespace ICSharpCode.ILSpy.TreeNodes

 		public override object Text => Resources.DerivedTypes;

-		public override object Icon => Images.GetIcon(Images.SubTypes);
+		public override object Icon => Images.SubTypes;

 		protected override void LoadChildren()
 		{
--- a/ILSpy/TreeNodes/ModuleReferenceTreeNode.cs
+++ b/ILSpy/TreeNodes/ModuleReferenceTreeNode.cs
@ -61,7 +61,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
				@@ -61,7 +61,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			get { return moduleName + ((EntityHandle)handle).ToSuffixString(); }
 		}

-		public override object Icon => Images.GetIcon(Images.Library);
+		public override object Icon => Images.Library;

 		public override void ActivateItem(System.Windows.RoutedEventArgs e)
 		{
--- a/ILSpy/TreeNodes/NamespaceTreeNode.cs
+++ b/ILSpy/TreeNodes/NamespaceTreeNode.cs
@ -45,7 +45,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
				@@ -45,7 +45,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 		}
 		
 		public override object Icon {
-			get { return Images.GetIcon(Images.Namespace); }
+			get { return Images.Namespace; }
 		}
 		
 		public override FilterResult Filter(FilterSettings settings)
--- a/ILSpy/TreeNodes/ReferenceFolderTreeNode.cs
+++ b/ILSpy/TreeNodes/ReferenceFolderTreeNode.cs
@ -18,7 +18,6 @@
				@@ -18,7 +18,6 @@

 using System;
 using System.Linq;
-using SRM = System.Reflection.Metadata;
 using System.Windows.Threading;
 using ICSharpCode.Decompiler;
 using ICSharpCode.Decompiler.Metadata;
@ -40,15 +39,11 @@ namespace ICSharpCode.ILSpy.TreeNodes
				@@ -40,15 +39,11 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			this.parentAssembly = parentAssembly;
 			this.LazyLoading = true;
 		}
-		
-		public override object Text {
-			get { return Resources.References; }
-		}
-		
-		public override object Icon {
-			get { return Images.GetIcon(Images.ReferenceFolder); }
-		}
-		
+
+		public override object Text => Resources.References;
+
+		public override object Icon => Images.ReferenceFolder;
+
 		protected override void LoadChildren()
 		{
 			var metadata = module.Metadata;
--- a/ILSpy/TreeNodes/ResourceListTreeNode.cs
+++ b/ILSpy/TreeNodes/ResourceListTreeNode.cs
@ -37,19 +37,13 @@ namespace ICSharpCode.ILSpy.TreeNodes
				@@ -37,19 +37,13 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			this.LazyLoading = true;
 			this.module = module;
 		}
-		
-		public override object Text {
-			get { return Resources._Resources; }
-		}
-		
-		public override object Icon {
-			get { return Images.GetIcon(Images.FolderClosed); }
-		}

-		public override object ExpandedIcon {
-			get { return Images.GetIcon(Images.FolderOpen); }
-		}
-		
+		public override object Text => Resources._Resources;
+
+		public override object Icon => Images.FolderClosed;
+
+		public override object ExpandedIcon => Images.FolderOpen;
+
 		protected override void LoadChildren()
 		{
 			foreach (Resource r in module.Resources.OrderBy(m => m.Name, NaturalStringComparer.Instance))
--- a/ILSpy/TreeNodes/ResourceNodes/CursorResourceEntryNode.cs
+++ b/ILSpy/TreeNodes/ResourceNodes/CursorResourceEntryNode.cs
@ -59,10 +59,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
				@@ -59,10 +59,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 		{
 		}

-		public override object Icon
-		{
-			get { return Images.GetIcon(Images.ResourceImage); }
-		}
+		public override object Icon => Images.ResourceImage;

 		public override bool View(DecompilerTextView textView)
 		{
--- a/ILSpy/TreeNodes/ResourceNodes/IconResourceEntryNode.cs
+++ b/ILSpy/TreeNodes/ResourceNodes/IconResourceEntryNode.cs
@ -58,10 +58,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
				@@ -58,10 +58,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 		{
 		}

-		public override object Icon
-		{
-			get { return Images.GetIcon(Images.ResourceImage); }
-		}
+		public override object Icon => Images.ResourceImage;

 		public override bool View(DecompilerTextView textView)
 		{
--- a/ILSpy/TreeNodes/ResourceNodes/ImageListResourceEntryNode.cs
+++ b/ILSpy/TreeNodes/ResourceNodes/ImageListResourceEntryNode.cs
@ -58,10 +58,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
				@@ -58,10 +58,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			get { return key; }
 		}

-		public override object Icon
-		{
-			get { return Images.GetIcon(Images.ResourceImage); }
-		}
+		public override object Icon => Images.ResourceImage;

 		protected override void LoadChildren()
 		{
--- a/ILSpy/TreeNodes/ResourceNodes/ImageResourceEntryNode.cs
+++ b/ILSpy/TreeNodes/ResourceNodes/ImageResourceEntryNode.cs
@ -65,10 +65,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
				@@ -65,10 +65,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 		{
 		}

-		public override object Icon
-		{
-			get { return Images.GetIcon(Images.ResourceImage); }
-		}
+		public override object Icon => Images.ResourceImage;

 		public override bool View(DecompilerTextView textView)
 		{
--- a/ILSpy/TreeNodes/ResourceNodes/ResourceEntryNode.cs
+++ b/ILSpy/TreeNodes/ResourceNodes/ResourceEntryNode.cs
@ -32,21 +32,11 @@ namespace ICSharpCode.ILSpy.TreeNodes
				@@ -32,21 +32,11 @@ namespace ICSharpCode.ILSpy.TreeNodes
 		private readonly string key;
 		private readonly Stream data;

-		public override object Text
-		{
-			get { return this.key; }
-		}
+		public override object Text => this.key;

-		public override object Icon
-		{
-			get { return Images.GetIcon(Images.Resource); }
-		}
-
-		protected Stream Data
-		{
-			get { return data; }
-		}
+		public override object Icon => Images.Resource;

+		protected Stream Data => data;

 		public ResourceEntryNode(string key, Stream data)
 		{
--- a/ILSpy/TreeNodes/ResourceNodes/ResourceTreeNode.cs
+++ b/ILSpy/TreeNodes/ResourceNodes/ResourceTreeNode.cs
@ -36,48 +36,40 @@ namespace ICSharpCode.ILSpy.TreeNodes
				@@ -36,48 +36,40 @@ namespace ICSharpCode.ILSpy.TreeNodes
 	/// </summary>
 	public class ResourceTreeNode : ILSpyTreeNode
 	{
-		readonly Resource r;
-		
 		public ResourceTreeNode(Resource r)
 		{
 			if (r.IsNil)
 				throw new ArgumentNullException(nameof(r));
-			this.r = r;
+			this.Resource = r;
 		}
-		
-		public Resource Resource {
-			get { return r; }
-		}
-		
-		public override object Text {
-			get { return r.Name; }
-		}
-		
-		public override object Icon {
-			get { return Images.GetIcon(Images.Resource); }
-		}
-		
+
+		public Resource Resource { get; }
+
+		public override object Text => Resource.Name;
+
+		public override object Icon => Images.Resource;
+
 		public override FilterResult Filter(FilterSettings settings)
 		{
-			if (settings.ShowApiLevel == ApiVisibility.PublicOnly && (r.Attributes & ManifestResourceAttributes.VisibilityMask) == ManifestResourceAttributes.Private)
+			if (settings.ShowApiLevel == ApiVisibility.PublicOnly && (Resource.Attributes & ManifestResourceAttributes.VisibilityMask) == ManifestResourceAttributes.Private)
 				return FilterResult.Hidden;
-			if (settings.SearchTermMatches(r.Name))
+			if (settings.SearchTermMatches(Resource.Name))
 				return FilterResult.Match;
 			else
 				return FilterResult.Hidden;
 		}
-		
+
 		public override void Decompile(Language language, ITextOutput output, DecompilationOptions options)
 		{
-			language.WriteCommentLine(output, string.Format("{0} ({1}, {2})", r.Name, r.ResourceType, r.Attributes));
-			
+			language.WriteCommentLine(output, string.Format("{0} ({1}, {2})", Resource.Name, Resource.ResourceType, Resource.Attributes));
+
 			ISmartTextOutput smartOutput = output as ISmartTextOutput;
 			if (smartOutput != null) {
 				smartOutput.AddButton(Images.Save, Resources.Save, delegate { Save(MainWindow.Instance.TextView); });
 				output.WriteLine();
 			}
 		}
-		
+
 		public override bool View(DecompilerTextView textView)
 		{
 			Stream s = Resource.TryOpenStream();
@ -99,7 +91,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
				@@ -99,7 +91,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			}
 			return false;
 		}
-		
+
 		public override bool Save(DecompilerTextView textView)
 		{
 			Stream s = Resource.TryOpenStream();
@ -115,7 +107,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
				@@ -115,7 +107,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			}
 			return true;
 		}
-		
+
 		public static ILSpyTreeNode Create(Resource resource)
 		{
 			ILSpyTreeNode result = null;
--- a/ILSpy/TreeNodes/ResourceNodes/ResourcesFileTreeNode.cs
+++ b/ILSpy/TreeNodes/ResourceNodes/ResourcesFileTreeNode.cs
@ -60,9 +60,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
				@@ -60,9 +60,7 @@ namespace ICSharpCode.ILSpy.TreeNodes
 			this.LazyLoading = true;
 		}

-		public override object Icon {
-			get { return Images.GetIcon(Images.ResourceResourcesFile); }
-		}
+		public override object Icon => Images.ResourceResourcesFile;

 		protected override void LoadChildren()
 		{
--- a/ILSpy/TreeNodes/ResourceNodes/XmlResourceNode.cs
+++ b/ILSpy/TreeNodes/ResourceNodes/XmlResourceNode.cs
@ -69,13 +69,13 @@ namespace ICSharpCode.ILSpy.Xaml
				@@ -69,13 +69,13 @@ namespace ICSharpCode.ILSpy.Xaml
 			{
 				string text = (string)Text;
 				if (text.EndsWith(".xml", StringComparison.OrdinalIgnoreCase))
-					return Images.GetIcon(Images.ResourceXml);
+					return Images.ResourceXml;
 				else if (text.EndsWith(".xsd", StringComparison.OrdinalIgnoreCase))
-					return Images.GetIcon(Images.ResourceXsd);
+					return Images.ResourceXsd;
 				else if (text.EndsWith(".xslt", StringComparison.OrdinalIgnoreCase))
-					return Images.GetIcon(Images.ResourceXslt);
+					return Images.ResourceXslt;
 				else
-					return Images.GetIcon(Images.Resource);
+					return Images.Resource;
 			}
 		}

--- a/SharpTreeView/ICSharpCode.TreeView.csproj
+++ b/SharpTreeView/ICSharpCode.TreeView.csproj
@ -46,7 +46,6 @@
				@@ -46,7 +46,6 @@
    <Compile Include="EditTextBox.cs" />
    <Compile Include="ExtensionMethods.cs" />
    <Compile Include="GeneralAdorner.cs" />
-    <Compile Include="IconDataTemplateSelector.cs" />
    <Compile Include="InsertMarker.cs" />
    <Compile Include="LinesRenderer.cs" />
    <Compile Include="Properties\AssemblyInfo.cs" />
--- a/SharpTreeView/IconDataTemplateSelector.cs
+++ b/SharpTreeView/IconDataTemplateSelector.cs
@ -1,28 +0,0 @@
				@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Controls;
-using System.Windows.Media;
-
-namespace ICSharpCode.TreeView
-{
-	class IconDataTemplateSelector : DataTemplateSelector
-	{
-		public DataTemplate ImageDataTemplate { get; set; }
-
-		public DataTemplate VectorDataTemplate { get; set; }
-
-		public override DataTemplate SelectTemplate(object item, DependencyObject container)
-		{
-			if (item is ImageSource)
-				return ImageDataTemplate;
-			if (item is DrawingGroup)
-				return VectorDataTemplate;
-
-			return base.SelectTemplate(item, container);
-		}
-	}
-}
--- a/SharpTreeView/Themes/Generic.xaml
+++ b/SharpTreeView/Themes/Generic.xaml
@ -257,24 +257,13 @@
				@@ -257,24 +257,13 @@
                                                  Margin="0 0 5 1"
                                                  VerticalAlignment="Center"
                                                  Focusable="False">
-									<ContentPresenter.ContentTemplateSelector>
-										<Default:IconDataTemplateSelector>
-											<Default:IconDataTemplateSelector.ImageDataTemplate>
-												<DataTemplate>
-													<Image Source="{Binding}"/>
-												</DataTemplate>
-											</Default:IconDataTemplateSelector.ImageDataTemplate>
-											<Default:IconDataTemplateSelector.VectorDataTemplate>
-												<DataTemplate>
-													<Viewbox Width="16" Height="16">
-														<Rectangle Width="16" Height="16" Fill="{Binding}" />
-													</Viewbox>
-												</DataTemplate>
-											</Default:IconDataTemplateSelector.VectorDataTemplate>
-										</Default:IconDataTemplateSelector>
-									</ContentPresenter.ContentTemplateSelector>
+									<ContentPresenter.ContentTemplate>
+										<DataTemplate>
+											<Image Source="{Binding}"/>
+										</DataTemplate>
+									</ContentPresenter.ContentTemplate>
 								</ContentPresenter>
-                                <Border Name="textContainer"
+								<Border Name="textContainer"
                                        Background="{TemplateBinding TextBackground}">
                                    <ContentPresenter Content="{Binding Text}"
                                                      Margin="2 0 6 0"