--- a/FileSelectionItem.st	Tue Oct 18 02:15:03 2016 +0200
+++ b/FileSelectionItem.st	Tue Oct 18 02:15:24 2016 +0200
@@ -11,6 +11,8 @@
 "
 "{ Package: 'stx:libwidg2' }"
 
+"{ NameSpace: Smalltalk }"
+
 TreeItem subclass:#FileSelectionItem
 	instanceVariableNames:'modificationTime matchAction isDirectory imageType showIndicator'
 	classVariableNames:'ReadDirectoriesForIndicator'
@@ -135,28 +137,33 @@
     |icons image|
 
     icons := IdentityDictionary new.
-
+    
     #(
-        (#directory       'tiny_yellow_dir.xpm')
-        (#directoryOpened 'tiny_yellow_dir_open.xpm')
-        (#directoryLocked 'tiny_yellow_dir_locked.xpm')
-        (#directoryLink   'tiny_yellow_dir_link.xpm'  )
+        (#directory       fileTypeDirectoryIcon         'tiny_yellow_dir.xpm')
+        (#directoryOpened fileTypeDirectoryOpenIcon     'tiny_yellow_dir_open.xpm')
+        (#directoryLocked fileTypeDirectoryLockedIcon   'tiny_yellow_dir_locked.xpm')
+        (#directoryLink   fileTypeDirectoryLinkIcon     'tiny_yellow_dir_link.xpm'  )
 
-        (#file            'tiny_file_plain.xpm'       )
-        (#fileLink        'tiny_file_link.xpm'        )
-        (#fileLocked      'tiny_file_lock.xpm'        )
-        (#imageFile       'tiny_file_pix.xpm'         )
+        (#file            fileTypeFileIcon              'tiny_file_plain.xpm'       )
+        (#fileLink        fileTypeFileLinkIcon          'tiny_file_link.xpm'        )
+        (#fileLocked      fileTypeFileLockedIcon        'tiny_file_lock.xpm'        )
+        (#imageFile       fileTypeImageFileIcon         'tiny_file_pix.xpm'         )
 
      ) do:[:el |
-        image := Image fromFile:('xpmBitmaps/document_images/', el last ).
+        |key sel fileName|
 
+        key := el at:1.
+        sel := el at:2.
+        fileName := el at:3.
+        image := ToolbarIconLibrary perform:sel.
+        image isNil ifTrue:[
+            image := Image fromFile:('xpmBitmaps/document_images/', fileName ).
+        ].
         image notNil ifTrue:[
             icons at:(el first) put:image.
         ]
     ].
-  ^ icons
-
-
+    ^ icons
 ! !
 
 !FileSelectionItem methodsFor:'accessing'!
@@ -736,7 +743,7 @@
 !FileSelectionItem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/FileSelectionItem.st,v 1.22 2013-04-25 13:12:17 stefan Exp $'
+    ^ '$Header$'
 ! !