diff --git a/repository/OpenPonk-Core/OPCoreIcons.class.st b/repository/OpenPonk-Core/OPCoreIcons.class.st
index b0a32f84..241ab6e6 100644
--- a/repository/OpenPonk-Core/OPCoreIcons.class.st
+++ b/repository/OpenPonk-Core/OPCoreIcons.class.st
@@ -1131,27 +1131,27 @@ LkyAhQTNdxgYGJ7gixFCQGc0NWMHAKweDmH+UsOrAAAAAElFTkSuQmCC'
 ]
 
 { #category : 'as yet unclassified' }
-OPCoreIcons class >> opHideLabelsContents [
+OPCoreIcons class >> opHideLabelsIcon [
 
-	^ 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAOklEQVQoz2NkYGD4/5+RASdgYWBgYGBk4EcT/sjwH1nBf9wGMDAxEACjCqilgAVCCaAJf4CzGAlFNwAbkwgipGLcfgAAAABJRU5ErkJggg=='
+	^ Form fromBinaryStream: self opHideLabelsIconContents base64Decoded asByteArray readStream
 ]
 
 { #category : 'as yet unclassified' }
-OPCoreIcons class >> opHideLabelsIcon [
+OPCoreIcons class >> opHideLabelsIconContents [
 
-	^ Form fromBinaryStream: self opHideLabelsContents base64Decoded asByteArray readStream
+	^ 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAiUlEQVQoz33RMQrCQBAF0GeiNxAC5gIK2niA2OSQHsbSRhCxECwtBCUoCForFqIB2d1fDcxjdpnJtZm7OfpL9qt6pi7EwcTTOQVqO484yFQWEilsFaHGd0KpCX2xBSNrrxSoLMNvf0Bu7JACQ12nFKjt3eOgY5beQd9GGWtmKF1DV2jBwCq8A3gD71EYmTfN21wAAAAASUVORK5CYII='
 ]
 
 { #category : 'as yet unclassified' }
-OPCoreIcons class >> opHideSameLabelsContents [
+OPCoreIcons class >> opHideSomeLabelsIcon [
 
-	^ 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAPElEQVQoz2NkYGD4/5+RASdgYWBgYGBk4Gdl+I0s/JHhP5TFSMgEJgYCYFQBtRSwQCiB/6jCH+CxQzCyAP9OCx+tRQshAAAAAElFTkSuQmCC'
+	^ Form fromBinaryStream: self opHideSomeLabelsIconContents base64Decoded asByteArray readStream
 ]
 
 { #category : 'as yet unclassified' }
-OPCoreIcons class >> opHideSameLabelsIcon [
+OPCoreIcons class >> opHideSomeLabelsIconContents [
 
-	^ Form fromBinaryStream: self opHideSameLabelsContents base64Decoded asByteArray readStream
+	^ 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAmklEQVQoz33QPQrCQBCG4XfzA/YWAdOkNKCNB0iatLmfB7EUbGyEFCkESwXBIAkIpkhlsBBdkJ35qmX2YWYYH5s1D678xfu9Qla0IIMlLxoNFBzpZeCRsUVJRE3k+vh2iLm7VrQgpWLUQMbePfsDfBacNTAn4KaBghNPGRhy+QYBMCVhl0z6wZZN2W0siOloLiNGGjHj4L4BwBuZxB5zJOJJxAAAAABJRU5ErkJggg=='
 ]
 
 { #category : 'as yet unclassified' }
@@ -1218,15 +1218,15 @@ v/dmQSaCxb50u11+8hs/gG99/Qf21bg5RlgkZQAAAABJRU5ErkJggg=='
 ]
 
 { #category : 'as yet unclassified' }
-OPCoreIcons class >> opShowLabelsContents [
+OPCoreIcons class >> opShowLabelsIcon [
 
-	^ 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAPUlEQVQoz2NkYGD4/5+RASdgYWBgYGBk4P+PKvyR8T+ygv8MDDjNYGIgAEYVUEsBC4QSQIusD/C4YSQU3QA+VwojR7FvAAAAAABJRU5ErkJggg=='
+	^ Form fromBinaryStream: self opShowLabelsIconContents base64Decoded asByteArray readStream
 ]
 
 { #category : 'as yet unclassified' }
-OPCoreIcons class >> opShowLabelsIcon [
+OPCoreIcons class >> opShowLabelsIconContents [
 
-	^ Form fromBinaryStream: self opShowLabelsContents base64Decoded asByteArray readStream
+	^ 'iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAQAAAC1+jfqAAAACXBIWXMAAC4jAAAuIwF4pT92AAAAn0lEQVQoz32QsQqCYBSFv1//oL1ByMWxoBYfwBbX3q8HaQxaWoKGhqBRIVAiIcihKWmIvKDX/0wHzsc9l+Mj2vDkRkde60bEPOjJtm7JhzIa128JzbraCpByoc7B6BUeCTscCjgTaMH/Qshde1GAOScaF5Bw0Lt/gM+CzAXMsBQuIOXKaxgwrIY3sMCEiH1/ZAFCKsq86Y4sFVOO+gYAX+T1I1hMBdlaAAAAAElFTkSuQmCC'
 ]
 
 { #category : 'accessing - icons' }
diff --git a/repository/OpenPonk-Spec/OPDiagramFigureColorCommand.class.st b/repository/OpenPonk-Spec/OPDiagramFigureColorCommand.class.st
index 33caea02..bb616a6c 100644
--- a/repository/OpenPonk-Spec/OPDiagramFigureColorCommand.class.st
+++ b/repository/OpenPonk-Spec/OPDiagramFigureColorCommand.class.st
@@ -111,7 +111,7 @@ OPDiagramFigureColorCommand >> defaultMenuItemName [
 	^ String streamContents: [ :s |
 		  s << self colorName.
 		  isDefault ifTrue: [ s << ' (default)' ].
-		  isCurrent ifTrue: [ s << ' [current]' ] ]
+		  isCurrent ifTrue: [ s << ' [selected]' ] ]
 ]
 
 { #category : 'execution' }