--- a/MenuPanel.st	Tue Sep 13 16:50:00 2016 +0200
+++ b/MenuPanel.st	Tue Sep 13 17:41:57 2016 +0200
@@ -861,12 +861,10 @@
         ^ anImage
     ].
 
-    Images isNil ifTrue:[ Images := WeakIdentityDictionary new ].
-
-    (deviceImages := Images at:aDevice ifAbsent:nil) isNil ifTrue:[
-        Images at:aDevice put:(deviceImages := Dictionary new)
-    ].
-
+    Images isNil ifTrue:[ 
+        Images := WeakIdentityDictionary new.
+    ].
+    deviceImages := Images at:aDevice ifAbsentPut:[Dictionary new].
     ^ deviceImages at:anImage ifAbsentPut:[anImage copy onDevice:aDevice].
 !