diff --git a/Molecule-IDE/MolSpBrowseComponentClasses.class.st b/Molecule-IDE/MolSpBrowseComponentClasses.class.st
index c3d83b21..6b2d629b 100644
--- a/Molecule-IDE/MolSpBrowseComponentClasses.class.st
+++ b/Molecule-IDE/MolSpBrowseComponentClasses.class.st
@@ -28,7 +28,7 @@ MolSpBrowseComponentClasses >> initializePresenters [
 	table := self newTreeTable.
 	table addColumn: (SpCompositeTableColumn new
 			title: 'Double click on a class to browse it...';
-			addColumn: ((SpImageTableColumn evaluated: #systemIcon)
+			addColumn: ((SpImageTableColumn evaluated: [ :e | e iconNamed: e systemIconName])
 				width: 20;
 				yourself);
 			addColumn: (SpStringTableColumn evaluated: #name);
diff --git a/Molecule-IDE/MolWorld.class.st b/Molecule-IDE/MolWorld.class.st
index d3718ab1..8d075a4a 100644
--- a/Molecule-IDE/MolWorld.class.st
+++ b/Molecule-IDE/MolWorld.class.st
@@ -152,7 +152,7 @@ MolWorld class >> openDefineComponentDialog [
 	list := SystemNavigation default allClasses select: [ :c | 
 		        c isTrait not and: [ 
 			        (c allSuperclasses includes: Object) and: [ c isComponentClass ] ] ].
-	searchClass := SearchFacade classSearchIn: list.
+	searchClass := MCSearchFacade classSearchIn: list.
 	searchClass title: 'Select the Molecule Component to define'.
 	retValue := searchClass openModal.
 	^ retValue answer