--- a/Icon.st	Wed Dec 01 21:17:58 1999 +0100
+++ b/Icon.st	Wed Dec 01 21:25:19 1999 +0100
@@ -130,15 +130,15 @@
     icon isNil ifTrue:[
         nm := self replacementNameFor:aName.
         nm notNil ifTrue:[
-            icon := Image fromFile:('bitmaps/' , nm).
+            icon := Smalltalk bitmapFromFileNamed:nm forClass:self.
             icon isNil ifTrue:[
-                icon := Image fromFile:('bitmaps/' , nm , '.xbm').
+                icon := Smalltalk bitmapFromFileNamed:(nm , '.xbm') forClass:self.
             ]
         ].
         icon isNil ifTrue:[
-            icon := Image fromFile:('bitmaps/' , aName).
+            icon := Smalltalk bitmapFromFileNamed:aName forClass:self.
             icon isNil ifTrue:[
-                icon := Image fromFile:('bitmaps/' , aName , '.xbm').
+                icon := Smalltalk bitmapFromFileNamed:(aName , '.xbm') forClass:self.
             ].
             icon isNil ifTrue:[
                 ^ nil
@@ -183,7 +183,7 @@
 
     ^ self
         constantNamed:aName
-        ifAbsentPut:[Image fromFile:aFileName]
+        ifAbsentPut:[Smalltalk bitmapFromFileNamed:aFileName forClass:self]
 
 !
 
@@ -480,7 +480,7 @@
 
     (icn := self constantNamed:'stxIcon') isNil ifTrue:[
         OperatingSystem platformName == #win32 ifTrue:[
-            icn := Image fromFile:'bitmaps/stx_32x32.xpm'.
+            icn := Smalltalk bitmapFromFileNamed:'stx_32x32.xpm' forClass:self.
         ].
         icn isNil ifTrue:[
             icn := self stxIconOld.
@@ -542,6 +542,6 @@
 !Icon class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/Icon.st,v 1.24 1999-08-18 14:45:37 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/Icon.st,v 1.25 1999-12-01 20:25:19 cg Exp $'
 ! !
 Icon initialize!