diff --git a/src/VisualStudio/ProjectBase/ReferenceContainerNode.cs b/src/VisualStudio/ProjectBase/ReferenceContainerNode.cs
index 38163c4da8..7acc99aced 100644
--- a/src/VisualStudio/ProjectBase/ReferenceContainerNode.cs
+++ b/src/VisualStudio/ProjectBase/ReferenceContainerNode.cs
@@ -10,6 +10,8 @@
  * ***************************************************************************/
 
 using Microsoft.VisualStudio;
+using Microsoft.VisualStudio.Imaging;
+using Microsoft.VisualStudio.Imaging.Interop;
 using Microsoft.VisualStudio.Shell;
 using Microsoft.VisualStudio.Shell.Interop;
 
@@ -180,11 +182,21 @@ public override string GetEditLabel()
         {
             return null;
         }
-
+        #if DEV17
+        protected override bool SupportsIconMonikers => true;
+        protected override ImageMoniker GetIconMoniker(bool open)
+        {
+            return KnownMonikers.ReferenceGroup;
+        }
+        #endif
 
         public override object GetIconHandle(bool open)
         {
+            #if DEV17
+            return base.GetIconHandle(open);
+            #else
             return this.ProjectMgr.ImageHandler.GetIconHandle(open ? (int)ProjectNode.ImageName.OpenReferenceFolder : (int)ProjectNode.ImageName.ReferenceFolder);
+            #endif
         }
 
 
diff --git a/src/VisualStudio/ProjectPackage/Menus.vsct b/src/VisualStudio/ProjectPackage/Menus.vsct
index 6d88d5b26d..3901858513 100644
--- a/src/VisualStudio/ProjectPackage/Menus.vsct
+++ b/src/VisualStudio/ProjectPackage/Menus.vsct
@@ -121,7 +121,8 @@
 
       <!--This will be on the ToolMenu in the ToolMenuGroup-->
       <Button guid="guidProjectPackage" id="idXporter" priority="0x0100" type="Button">
-        <Icon guid="guidImages" id="bmpXSharp" />
+        <Icon guid="ImageCatalogGuid" id="Export" />
+        <CommandFlag>IconIsMoniker</CommandFlag>
         <CommandFlag>IconAndText</CommandFlag>
         <Strings>
           <CommandName>&amp;Export a Vulcan.NET Project</CommandName>
@@ -132,7 +133,8 @@
         </Strings>
       </Button>
       <Button guid="guidProjectPackage" id="idVOXporter" priority="0x0100" type="Button">
-        <Icon guid="guidImages" id="bmpVO" />
+        <Icon guid="ImageCatalogGuid" id="Export" />
+        <CommandFlag>IconIsMoniker</CommandFlag>
         <CommandFlag>IconAndText</CommandFlag>
         <Strings>
           <CommandName>E&amp;xport a Visual Objects Project</CommandName>
@@ -155,7 +157,8 @@
         </Strings>
       </Button>
       <Button guid="guidProjectPackage" id="idFoxXporter" priority="0x0100" type="Button">
-        <Icon guid="guidImages" id="bmpFoxPro" />
+        <Icon guid="ImageCatalogGuid" id="Export" />
+        <CommandFlag>IconIsMoniker</CommandFlag>
         <CommandFlag>IconAndText</CommandFlag>
         <Strings>
           <CommandName>Export a Visual &amp;FoxPro Project</CommandName>
@@ -268,7 +271,8 @@
         </Strings>
       </Button>
       <Button guid="guidVOFormEditorCmdSet" id="cmdIdXsTabOrder" priority="0x0400" type="Button">
-        <Icon guid="guidImages" id="bmpTabOrder" />
+        <Icon guid="ImageCatalogGuid" id="Tab" />
+        <CommandFlag>IconIsMoniker</CommandFlag>
         <CommandFlag>IconAndText</CommandFlag>
         <CommandFlag>DefaultInvisible</CommandFlag>
         <CommandFlag>DefaultDisabled</CommandFlag>
@@ -393,7 +397,8 @@
 
 
       <Button guid="guidProjectPackage" id="idConvertSDKProject" priority="0x0400" type="Button">
-        <Icon guid="guidImages" id="bmpXSharp" />
+        <Icon guid="ImageCatalogGuid" id="Transform" />
+        <CommandFlag>IconIsMoniker</CommandFlag>
         <CommandFlag>DynamicVisibility</CommandFlag>
         <CommandFlag>IconAndText</CommandFlag>
         <Strings>
@@ -419,7 +424,8 @@
         </Strings>
       </Button>
       <Button guid="guidProjectPackage" id="idAddDesignerFile" priority="0x0400" type="Button">
-        <Icon guid="guidImages" id="bmpXSharp" />
+        <Icon guid="ImageCatalogGuid" id="WindowsForm" />
+        <CommandFlag>IconIsMoniker</CommandFlag>
         <CommandFlag>DynamicVisibility</CommandFlag>
         <CommandFlag>IconAndText</CommandFlag>
         <Strings>
@@ -436,9 +442,6 @@
         </Strings>
       </Button>
     </Buttons>
-    <Bitmaps>
-      <Bitmap guid="guidImages" href="Resources\XSharpProjectImageList.bmp" />
-    </Bitmaps>
   </Commands>
   <CommandPlacements>
     <!--Group for Tools XSharp Menu-->
@@ -589,13 +592,6 @@
       <IDSymbol name="DebugTargetMenuControllerFooterGroup" value="0x2000" />
     </GuidSymbol>
 
-    <GuidSymbol name="guidImages" value="{9f1c712d-4803-4aff-9153-28b74c34e1bf}">
-      <IDSymbol name="bmpProject" value="1" />
-      <IDSymbol name="bmpXSharp" value="2" />
-      <IDSymbol name="bmpVO" value="7" />
-      <IDSymbol name="bmpTabOrder" value="13" />
-      <IDSymbol name="bmpFoxPro" value="14" />
-    </GuidSymbol>
     <!--
     Next symbols are defined by Visual Studio
     They are defined in the file WinformsDesignerMenus.vsct  that you can find
diff --git a/src/VisualStudio/ProjectPackage/Nodes/XSharpFileNode.cs b/src/VisualStudio/ProjectPackage/Nodes/XSharpFileNode.cs
index 8e1a8bb7a6..dd08f887a3 100644
--- a/src/VisualStudio/ProjectPackage/Nodes/XSharpFileNode.cs
+++ b/src/VisualStudio/ProjectPackage/Nodes/XSharpFileNode.cs
@@ -40,21 +40,23 @@ public class XSharpFileNode : XFileNode
 
         static XSharpFileNode()
         {
-            AddExtension(".vnfrm", KnownMonikers.FormInstance);
-            AddExtension(".xsfrm", KnownMonikers.FormInstance);
-            AddExtension(".vndbs", KnownMonikers.Database);
-            AddExtension(".vnmnu", KnownMonikers.MainMenuControl);
-            AddExtension(".xsmnu", KnownMonikers.MainMenuControl);
-            AddExtension(".xsdbs", KnownMonikers.Database);
-            AddExtension(".vnfs", KnownMonikers.ValidationRule);
-            AddExtension(".xsfs", KnownMonikers.ValidationRule);
-            AddExtension(".xssql", KnownMonikers.Database);
-            AddExtension(".xsrep", KnownMonikers.Report);
-            AddExtension(".vnsqs", KnownMonikers.Database);
-            AddExtension(".vnrep", KnownMonikers.Report);
+            MapExtensionsToMoniker(KnownMonikers.Script, ".prg", ".prgx", ".xs", ".ppo", ".vh", ".xh", ".ch");
+            MapExtensionsToMoniker(KnownMonikers.FormInstance, ".vnfrm", ".xsfrm");
+            MapExtensionsToMoniker(KnownMonikers.Database, ".vndbs", ".xsdbs", ".xssql", ".vnsqs");
+            MapExtensionsToMoniker(KnownMonikers.MainMenuControl, ".vnmnu", ".xsmnu");
+            MapExtensionsToMoniker(KnownMonikers.ValidationRule, ".vnfs", ".xsfs");
+            MapExtensionsToMoniker(KnownMonikers.Report, ".xsrep", ".vnrep");
             AddExtension(".xaml", KnownMonikers.WPFFile);
         }
 
+        private static void MapExtensionsToMoniker(ImageMoniker moniker, params string[] extensions)
+        {
+            foreach (string extension in extensions)
+            {
+                AddExtension(extension, moniker);
+            }
+        }
+
         /// <summary>
         /// Initializes a new instance of the <see cref="XSharpFileNode"/> class.
         /// </summary>
@@ -94,9 +96,7 @@ protected override bool SupportsIconMonikers
                 if (IsForm || IsUserControl || IsNonMemberItem)
                     return true;
 #if DEV17
-                if (!File.Exists(this.Url))
-                    return true;
-                return false;
+                return base.SupportsIconMonikers || !File.Exists(this.Url);
 #else
                 return base.SupportsIconMonikers;
 #endif
diff --git a/src/VisualStudio/ProjectPackage/Nodes/XSharpProjectNode.cs b/src/VisualStudio/ProjectPackage/Nodes/XSharpProjectNode.cs
index 088762d1d3..e4e981d107 100644
--- a/src/VisualStudio/ProjectPackage/Nodes/XSharpProjectNode.cs
+++ b/src/VisualStudio/ProjectPackage/Nodes/XSharpProjectNode.cs
@@ -10,6 +10,8 @@
 
 using Microsoft.Build.Execution;
 using Microsoft.VisualStudio;
+using Microsoft.VisualStudio.Imaging;
+using Microsoft.VisualStudio.Imaging.Interop;
 using Microsoft.VisualStudio.Project;
 using Microsoft.VisualStudio.Project.Automation;
 using Microsoft.VisualStudio.Shell;
@@ -80,6 +82,7 @@ static XSharpProjectNode()
             dependencies.Add(".vh", ".prg");
             dependencies.Add(".xh", ".prg");
             dependencies.Add(".resx", ".prg");
+#if !DEV17
             try
             {
                 imageList = Utilities.GetImageList(typeof(XSharpProjectNode).Assembly.GetManifestResourceStream("XSharp.Project.Resources.XSharpProjectImageList.bmp"));
@@ -87,6 +90,7 @@ static XSharpProjectNode()
             catch (Exception)
             {
             }
+#endif
             _changedProjectFiles = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
         }
         internal static IDictionary<string, string> ChangedProjectFiles => _changedProjectFiles;
@@ -98,7 +102,9 @@ static XSharpProjectNode()
 
         #region Fields
         private XSharpProjectPackage package;
+#if !DEV17
         private static ImageList imageList;
+#endif
         private VSLangProj.VSProject vsProject;
         bool isLoading = false;
         XSharpModel.XProject projectModel;
@@ -119,7 +125,9 @@ public XSharpProjectNode(XSharpProjectPackage package)
             this.package = package;
             _cachedProjectProperties = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
             this.OnProjectPropertyChanged += XSharpProjectNode_OnProjectPropertyChanged;
+#if !DEV17
             InitializeImageList();
+#endif
             InitializeCATIDs();
 
             // Used by (at least) the AddFromTemplate in order (for eg) to have Form1.Designer.Prg depending on Form1.prg
@@ -250,6 +258,7 @@ private void InitializeCATIDs()
         #region Properties
 
         internal bool IsLoading => isLoading;
+#if !DEV17
         /// <summary>
         /// Gets or sets the image list.
         /// </summary>
@@ -265,6 +274,7 @@ public static ImageList ImageList
                 imageList = value;
             }
         }
+#endif
         /// <summary>
         /// Gets the XSharpPackage instance for this project.
         /// </summary>
@@ -347,6 +357,11 @@ public override string ProjectType
         /// </summary>
         /// <value></value>
         /// <returns></returns>
+ #if DEV17
+        protected override bool SupportsIconMonikers => true;
+        protected override ImageMoniker GetIconMoniker(bool open) => KnownMonikers.Application;
+        public override int ImageIndex => HierarchyNode.NoImage;
+ #else
         public override int ImageIndex
         {
             get
@@ -354,6 +369,7 @@ public override int ImageIndex
                 return imageOffset;
             }
         }
+ #endif
 
         public override object Object
         {
@@ -1419,6 +1435,7 @@ private void CreateListManagers()
         }
 
 
+ #if !DEV17
         private void InitializeImageList()
         {
             imageOffset = this.ImageHandler.ImageList.Images.Count;
@@ -1428,6 +1445,7 @@ private void InitializeImageList()
                 this.ImageHandler.AddImage(img);
             }
         }
+ #endif
         /// <summary>
         /// Factory method for reference container node
         /// </summary>