--- a/HierarchicalListView.st	Sat Apr 02 17:11:20 2016 +0200
+++ b/HierarchicalListView.st	Sat Apr 02 17:12:19 2016 +0200
@@ -394,7 +394,7 @@
         lineColor := aColor.
 
         shown ifTrue:[
-            lineColor := lineColor onDevice:self graphicsDevice.
+            lineColor := lineColor onDevice:device.
             showLines ifTrue:[ self invalidate ]
         ]
     ].
@@ -1290,7 +1290,7 @@
 
     super fetchResources.
 
-    lineColor      := lineColor onDevice:self graphicsDevice.
+    lineColor      := lineColor onDevice:device.
     openIndicator  := self imageOnMyDevice:openIndicator.
     closeIndicator := self imageOnMyDevice:closeIndicator.
     defaultWidth   := imageWidth.
@@ -1304,7 +1304,7 @@
             imageWidth := image width max:imageWidth.
         ]
     ].
-    imageWidth      := (imageWidth + 1 // 2 * 2) max:defaultWidth.
+    imageWidth      := ((imageWidth + 1) // 2 * 2) max:defaultWidth.
     alignTextRightX := imageWidth + 20 max:alignTextRightX.
 ! !
 
@@ -1373,7 +1373,7 @@
         iconOrKey isImageOrForm ifTrue:[
             "/ got an image; have to register the image on my device
 
-            iconOrKey device == self graphicsDevice ifTrue:[
+            iconOrKey device == device ifTrue:[
                 ^ iconOrKey
             ].
             ^ icons at:iconOrKey ifAbsentPut:[ self imageOnMyDevice:iconOrKey ].