--- a/BrowserView.st	Sat Apr 02 17:14:34 2016 +0200
+++ b/BrowserView.st	Sat Apr 02 17:15:08 2016 +0200
@@ -7405,7 +7405,7 @@
 
     |untranslatedKey|
 
-    untranslatedKey := self graphicsDevice keyboardMap keyAtValue:key ifAbsent:key.
+    untranslatedKey := device keyboardMap keyAtValue:key ifAbsent:key.
 
     view == classCategoryListView ifTrue:[
         (key == #Find) ifTrue:[^ true].
@@ -7453,7 +7453,7 @@
     "/
     "/ have to untranslate (since we get #Inspect / #Search
     "/
-    untranslatedKey := self graphicsDevice keyboardMap keyAtValue:key ifAbsent:key.
+    untranslatedKey := device keyboardMap keyAtValue:key ifAbsent:key.
 
     view == classCategoryListView ifTrue:[
         (key == #Find) ifTrue:[^ self classCategoryFindClass].
@@ -13243,10 +13243,10 @@
             "/ Icons at:name put:icn.
         ].
         h := icn height.
-        h > (fh := SelectionInListView defaultFont heightOn:self graphicsDevice) ifTrue:[
+        h > (fh := SelectionInListView defaultFont heightOn:device) ifTrue:[
             icn := icn magnifiedBy:(fh / h)
         ].
-        icn onDevice:self graphicsDevice
+        icn onDevice:device
       ]
 
     "
@@ -13506,7 +13506,7 @@
                             cls := actualClass.
 
                             codeView modified ifFalse:[
-                                Screen currentScreenQuerySignal answer:self graphicsDevice
+                                Screen currentScreenQuerySignal answer:device
                                 do:[
                                     newCode := highlighter formatMethodSource:oldCode in:cls.
                                 ].