diff --git a/src/Molecule-IDE-Incubator/RSMolEvents.class.st b/src/Molecule-IDE-Incubator/RSMolEvents.class.st
index 40fbc462..2a105cfe 100644
--- a/src/Molecule-IDE-Incubator/RSMolEvents.class.st
+++ b/src/Molecule-IDE-Incubator/RSMolEvents.class.st
@@ -13,65 +13,72 @@ Class {
 { #category : #hooks }
 RSMolEvents >> onShape: aShape [
 
-	aShape when: RSMouseDoubleLeftClick do: [ :evt | 
-		| usedComponentServices usedComponentParameters consumedComponentEvents providedComponentServices providedComponentParameters producedComponentEvents showComponent |
-		showComponent := SpMolShowComponent new.
-		aShape model haveComponentType ifTrue: [ 
-			usedComponentServices := OrderedCollection new.
-			aShape model usedComponentServices do: [ :compo | 
-				compo users do: [ :comp | 
-					comp == aShape model ifFalse: [ usedComponentServices add: comp ] ] ].
+	aShape
+		when: RSMouseDoubleLeftClick
+		do: [ :evt |
+			| usedComponentServices usedComponentParameters consumedComponentEvents providedComponentServices providedComponentParameters producedComponentEvents showComponent |
+			showComponent := SpMolShowComponent new.
+			aShape model haveComponentType ifTrue: [
+				usedComponentServices := OrderedCollection new.
+				aShape model usedComponentServices do: [ :compo |
+					compo users do: [ :comp |
+						comp == aShape model ifFalse: [ usedComponentServices add: comp ] ] ].
 
-			usedComponentParameters := OrderedCollection new.
-			aShape model usedComponentParameters do: [ :compo | 
-				compo users do: [ :comp | 
-					comp == aShape model ifFalse: [ 
-						usedComponentParameters add: comp ] ] ].
+				usedComponentParameters := OrderedCollection new.
+				aShape model usedComponentParameters do: [ :compo |
+					compo users do: [ :comp |
+						comp == aShape model ifFalse: [
+							usedComponentParameters add: comp ] ] ].
 
-			consumedComponentEvents := OrderedCollection new.
-			aShape model consumedComponentEvents do: [ :compo | 
-				compo users do: [ :comp | 
-					comp == aShape model ifFalse: [ 
-						consumedComponentEvents add: comp ] ] ].
+				consumedComponentEvents := OrderedCollection new.
+				aShape model consumedComponentEvents do: [ :compo |
+					compo users do: [ :comp |
+						comp == aShape model ifFalse: [
+							consumedComponentEvents add: comp ] ] ].
 
-			providedComponentServices := OrderedCollection new.
-			aShape model providedComponentServices do: [ :compo | 
-				compo users do: [ :comp | 
-					comp == aShape model ifFalse: [ 
-						providedComponentServices add: comp ] ] ].
+				providedComponentServices := OrderedCollection new.
+				aShape model providedComponentServices do: [ :compo |
+					compo users do: [ :comp |
+						comp == aShape model ifFalse: [
+							providedComponentServices add: comp ] ] ].
 
-			providedComponentParameters := OrderedCollection new.
-			aShape model providedComponentParameters do: [ :compo | 
-				compo users do: [ :comp | 
-					comp == aShape model ifFalse: [ 
-						providedComponentParameters add: comp ] ] ].
+				providedComponentParameters := OrderedCollection new.
+				aShape model providedComponentParameters do: [ :compo |
+					compo users do: [ :comp |
+						comp == aShape model ifFalse: [
+							providedComponentParameters add: comp ] ] ].
 
-			producedComponentEvents := OrderedCollection new.
-			aShape model producedComponentEvents do: [ :compo | 
-				compo users do: [ :comp | 
-					comp == aShape model ifFalse: [ 
-						producedComponentEvents add: comp ] ] ].
+				producedComponentEvents := OrderedCollection new.
+				aShape model producedComponentEvents do: [ :compo |
+					compo users do: [ :comp |
+						comp == aShape model ifFalse: [
+							producedComponentEvents add: comp ] ] ].
 
-			showComponent usedComponentServicesConnected: usedComponentServices.
-			showComponent usedComponentParametersConnected:
-				usedComponentParameters.
-			showComponent providedComponentServicesConnected:
-				providedComponentServices.
-			showComponent providedComponentParametersConnected:
-				providedComponentParameters.
-			showComponent producedComponentEventsConnected:
-				producedComponentEvents.
-			showComponent consumedComponentEventsConnected:
-				consumedComponentEvents ].
-		showComponent component: aShape model.
-		showComponent open ].
+				showComponent usedComponentServicesConnected:
+					usedComponentServices.
+				showComponent usedComponentParametersConnected:
+					usedComponentParameters.
+				showComponent providedComponentServicesConnected:
+					providedComponentServices.
+				showComponent providedComponentParametersConnected:
+					providedComponentParameters.
+				showComponent producedComponentEventsConnected:
+					producedComponentEvents.
+				showComponent consumedComponentEventsConnected:
+					consumedComponentEvents ].
+			showComponent component: aShape model.
+			showComponent open ]
+		for: self.
 
-	aShape when: RSMouseRightClick do: [ :evt | 
-		| molMenu |
-		self selectedShape: aShape model.
-		molMenu := MolMenu new.
-		molMenu selectedComponent: selectedShape.
-		molMenu open: molMenu ]
+	aShape
+		when: RSMouseRightClick
+		do: [ :evt |
+			| molMenu |
+			self selectedShape: aShape model.
+			molMenu := MolMenu new.
+			molMenu selectedComponent: selectedShape.
+			molMenu open: molMenu ]
+		for: self
 ]
 
 { #category : #accessing }
diff --git a/src/Molecule-IDE-Incubator/SpMolInspect.class.st b/src/Molecule-IDE-Incubator/SpMolInspect.class.st
index b46c03ff..f2a3bfa2 100644
--- a/src/Molecule-IDE-Incubator/SpMolInspect.class.st
+++ b/src/Molecule-IDE-Incubator/SpMolInspect.class.st
@@ -25,7 +25,7 @@ SpMolInspect >> initializePresenters [
 	table := self newTreeTable.
 	table addColumn: (SpCompositeTableColumn new
 			title: 'Component';
-			addColumn: ((SpImageTableColumn evaluated: #systemIcon)
+			addColumn: ((SpImageTableColumn evaluated: [ :e | e iconNamed: e systemIconName])
 				width: 20;
 				yourself);
 			addColumn: (SpStringTableColumn evaluated: #name);