diff --git a/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct b/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct
index 5dbb839ece..2dba06b0ed 100644
--- a/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct
+++ b/code/TemplateStudioForWinUICs/Commands/TemplateStudioForWinuiPackage.vsct
@@ -3,6 +3,7 @@
 
 	<Extern href="stdidcmd.h"/>
 	<Extern href="vsshlids.h"/>
+    <Include href="KnownImageIds.vsct"/>
 
 	<Commands package="guidTemplateStudioForWinUICsPackage">
 		<Groups>
@@ -24,7 +25,8 @@
 				<CommandFlag>DefaultDisabled</CommandFlag>
 				<CommandFlag>DefaultInvisible</CommandFlag>
 				<CommandFlag>DynamicVisibility</CommandFlag>
-				<Icon guid="guidImages" id="bmpPage1" />
+				<CommandFlag>IconIsMoniker</CommandFlag>
+                <Icon guid="ImageCatalogGuid" id="NewDocument" />
 				<Strings>
 					<ButtonText>New Page...</ButtonText>
 				</Strings>
@@ -32,8 +34,8 @@
 			<Button guid="guidTemplateStudioForWinUICsPackageCmdSet" id="AddFeatureCommand" priority="0x0200" type="Button">
 				<CommandFlag>DefaultDisabled</CommandFlag>
 				<CommandFlag>DefaultInvisible</CommandFlag>
-				<CommandFlag>DynamicVisibility</CommandFlag>
-				<Icon guid="guidImages" id="bmpFeature1" />
+				<CommandFlag>IconIsMoniker</CommandFlag>
+                <Icon guid="ImageCatalogGuid" id="NewItem" />
 				<Strings>
 					<ButtonText>New Feature...</ButtonText>
 				</Strings>
@@ -42,7 +44,8 @@
 				<CommandFlag>DefaultDisabled</CommandFlag>
 				<CommandFlag>DefaultInvisible</CommandFlag>
 				<CommandFlag>DynamicVisibility</CommandFlag>
-				<Icon guid="guidImages" id="bmpService" />
+				<CommandFlag>IconIsMoniker</CommandFlag>
+                <Icon guid="ImageCatalogGuid" id="NewItem" />
 				<Strings>
 					<ButtonText>New Service...</ButtonText>
 				</Strings>
@@ -51,7 +54,8 @@
 				<CommandFlag>DefaultDisabled</CommandFlag>
 				<CommandFlag>DefaultInvisible</CommandFlag>
 				<CommandFlag>DynamicVisibility</CommandFlag>
-				<Icon guid="guidImages" id="bmpTesting" />
+                <CommandFlag>IconIsMoniker</CommandFlag>
+                <Icon guid="ImageCatalogGuid" id="NewTest" />
 				<Strings>
 					<ButtonText>New Test Project...</ButtonText>
 				</Strings>
@@ -60,16 +64,13 @@
 				<CommandFlag>DefaultDisabled</CommandFlag>
 				<CommandFlag>DefaultInvisible</CommandFlag>
 				<CommandFlag>DynamicVisibility</CommandFlag>
-				<Icon guid="guidImages" id="bmpOpenTemp" />
+                <CommandFlag>IconIsMoniker</CommandFlag>
+                <Icon guid="ImageCatalogGuid" id="OpenFolder" />
 				<Strings>
 					<ButtonText>Open Generation Folder</ButtonText>
 				</Strings>
 			</Button>
 		</Buttons>
-
-		<Bitmaps>
-			<Bitmap guid="guidImages" href="Resources\TemplateStudioCommand.png" usedList="bmpFeature1, bmpFeature2, bmpFeature3, bmpFeature4, bmpPage1, bmpWTS, bmpOpenTemp, bmpService, bmpTesting" />
-		</Bitmaps>
 	</Commands>
     <VisibilityConstraints>
         <VisibilityItem guid="guidTemplateStudioForWinUICsPackageCmdSet"
@@ -140,17 +141,5 @@
 			<IDSymbol name="AddTestingCommand" value="0x0700"/>
 			<IDSymbol name="OpenTempFolder" value="0x0800"/>
 		</GuidSymbol>
-
-		<GuidSymbol name="guidImages" value="{4060629C-FD00-4D0F-8C97-92747BFB7F28}" >
-			<IDSymbol name="bmpFeature1" value="1" />
-			<IDSymbol name="bmpFeature2" value="2" />
-			<IDSymbol name="bmpFeature3" value="3" />
-			<IDSymbol name="bmpFeature4" value="4" />
-			<IDSymbol name="bmpPage1" value="5" />
-			<IDSymbol name="bmpWTS" value="6" />
-			<IDSymbol name="bmpOpenTemp" value="7" />
-			<IDSymbol name="bmpService" value="8" />
-			<IDSymbol name="bmpTesting" value="9" />
-		</GuidSymbol>
 	</Symbols>
 </CommandTable>