--- a/Tools__TestRunner2.st	Fri Aug 05 16:01:37 2011 +0200
+++ b/Tools__TestRunner2.st	Fri Aug 05 16:23:55 2011 +0200
@@ -112,15 +112,19 @@
 !
 
 installInLauncher
-    |menuItem|
+    |menuItem action|
 
     NewLauncher isNil ifTrue:[^ self].
+    ToolbarIconLibrary isNil ifTrue:[^ self].
+
+    "Class may be changed, and we want to start the changed class"
+    action := (MessageSend receiver:(Smalltalk at:self name) selector:#open).
 
     "Install in Tools menu"
     menuItem := (MenuItem label:'SUnit Test Runner (enhanced)')
                 nameKey:'TestRunner2';
-                labelImage:(NewLauncher startSUnitIcon);
-                value:[ self open ];
+                labelImage:self startSUnitIcon;
+                value:action;
                 isButton:false.
     NewLauncher 
         addMenuItem:menuItem
@@ -133,8 +137,8 @@
     menuItem := (MenuItem new)
                 nameKey:#'TestRunner2';
                 "label: 'SUnit Test Runner (enhanced)'" 
-                icon:(NewLauncher startSUnitIcon);
-                value:[ self open ];
+                icon:self startSUnitIcon;
+                value:action;
                 isButton:true.
     NewLauncher 
         addMenuItem:menuItem
@@ -926,6 +930,15 @@
     "Modified: / 06-06-2008 / 20:04:49 / Jan Vrany <vranyj1@fel.cvut.cz>"
 ! !
 
+!TestRunner2 class methodsFor:'resources'!
+
+startSUnitIcon
+    <resource: #programImage>
+
+    ^ ToolbarIconLibrary sUnit24x24Icon    
+    "/ ^ ToolbarIconLibrary sUnit28x28Icon    
+! !
+
 !TestRunner2 class methodsFor:'startup'!
 
 openOnTestCase:aTestCaseClass
@@ -1683,7 +1696,7 @@
 !TestRunner2::ClassList class methodsFor:'documentation'!
 
 version
-    ^'$Id: Tools__TestRunner2.st,v 1.15 2011-08-05 14:01:37 stefan Exp $'
+    ^'$Id: Tools__TestRunner2.st,v 1.16 2011-08-05 14:23:55 stefan Exp $'
 ! !
 
 !TestRunner2::ClassList methodsFor:'private'!
@@ -2181,8 +2194,12 @@
 
 !TestRunner2 class methodsFor:'documentation'!
 
+version
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.16 2011-08-05 14:23:55 stefan Exp $'
+!
+
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.15 2011-08-05 14:01:37 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.16 2011-08-05 14:23:55 stefan Exp $'
 !
 
 version_SVN