--- a/Toggle.st	Tue Jan 24 23:24:05 2017 +0100
+++ b/Toggle.st	Tue Jan 24 23:25:06 2017 +0100
@@ -609,9 +609,9 @@
         ] ifFalse:[
             clr := bgColor.
         ].
-        self paint:clr.
+        gc paint:clr.
         l2 := LampInset*2.
-        self 
+        gc
             fillRectangleX:x+LampInset y:y+LampInset 
             width:(self lampImageWidth) - l2 
             height:(self lampImageHeight) - l2
@@ -626,6 +626,7 @@
      drawing of the lamp is done here."
 
     shown ifFalse:[^ self].
+    
     super drawWith:fg and:bg.   "this draws the text"
 
     self drawToggleImage.