From 02f48dcb43a0cc8d1c164169726cdb14dec54ded Mon Sep 17 00:00:00 2001
From: Kris <1611248+Rinzwind@users.noreply.github.com>
Date: Sun, 18 Feb 2024 16:58:06 +0100
Subject: [PATCH] Made #decorateToolbarItem: and #setUpIconForMenuItem: on
 CmdCommand use the FormSet for the icon.

---
 src/Calypso-Browser/CmdCommand.extension.st                  | 4 ++--
 src/Commander-Activators-ContextMenu/CmdCommand.extension.st | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Calypso-Browser/CmdCommand.extension.st b/src/Calypso-Browser/CmdCommand.extension.st
index 6d9856cf061..0138949d6e6 100644
--- a/src/Calypso-Browser/CmdCommand.extension.st
+++ b/src/Calypso-Browser/CmdCommand.extension.st
@@ -84,8 +84,8 @@ CmdCommand >> decorateToolbarItem: aBrowserToolbarItem [
 	self description ifNotNil: [ :d |
 		aBrowserToolbarItem setBalloonText: d ].
 
-	self defaultMenuIcon ifNotNil: [:icon |
-		aBrowserToolbarItem addIcon: icon asMorph]
+	self defaultMenuIconFormSet ifNotNil: [:iconFormSet |
+		aBrowserToolbarItem addIcon: iconFormSet asMorph]
 ]
 
 { #category : '*Calypso-Browser' }
diff --git a/src/Commander-Activators-ContextMenu/CmdCommand.extension.st b/src/Commander-Activators-ContextMenu/CmdCommand.extension.st
index b239dc555fd..099b06675bb 100644
--- a/src/Commander-Activators-ContextMenu/CmdCommand.extension.st
+++ b/src/Commander-Activators-ContextMenu/CmdCommand.extension.st
@@ -41,8 +41,8 @@ CmdCommand >> registerContextMenuItemsFor: aCommandItem withBuilder: aBuilder [
 { #category : '*Commander-Activators-ContextMenu' }
 CmdCommand >> setUpIconForMenuItem: aMenuItemMorph [
 
-	self defaultMenuIcon ifNotNil: [:icon |
-		aMenuItemMorph icon: icon ]
+	self defaultMenuIconFormSet ifNotNil: [:iconFormSet |
+		aMenuItemMorph iconFormSet: iconFormSet ]
 ]
 
 { #category : '*Commander-Activators-ContextMenu' }