--- a/Label.st	Tue Jan 24 22:58:34 2017 +0100
+++ b/Label.st	Tue Jan 24 23:04:58 2017 +0100
@@ -1880,29 +1880,27 @@
     mustClear := true.
 
     (logo notNil and:[logo isImageOrForm]) ifTrue:[
-	(labelOriginX == 0 and:[labelOriginY == 0]) ifTrue:[
-	    logo width >= (width - cutOff) ifTrue:[
-		logo height >= (height - cutOff) ifTrue:[
-		    "no need to clear before - avoid flicker"
-		    mustClear := false
-		]
-	    ]
-	].
+        (labelOriginX == 0 and:[labelOriginY == 0]) ifTrue:[
+            logo width >= (width - cutOff) ifTrue:[
+                logo height >= (height - cutOff) ifTrue:[
+                    "no need to clear before - avoid flicker"
+                    mustClear := false
+                ]
+            ]
+        ].
     ].
 
     mustClear ifTrue:[
-	self paint:bg.
-	self fillRectangleX:margin y:margin
-		      width:(width - cutOff)
-		     height:(height - cutOff).
+        gc paint:bg.
+        gc fillRectangleX:margin y:margin width:(width - cutOff) height:(height - cutOff).
     ].
 !
 
 drawImageLogo:imageOrForm x:x y:y opaque:opaque
     (opaque not or:[imageOrForm mask notNil]) ifTrue:[
-        self displayForm:imageOrForm x:x y:y 
+        gc displayForm:imageOrForm x:x y:y 
     ] ifFalse:[
-        self displayOpaqueForm:imageOrForm x:x y:y 
+        gc displayOpaqueForm:imageOrForm x:x y:y 
     ]
 !
 
@@ -1911,7 +1909,7 @@
 !
 
 drawStringLogo:aString x:x y:y
-    self displayString:aString x:x y:y
+    gc displayString:aString x:x y:y
 !
 
 drawWin95FocusFrame
@@ -1945,7 +1943,7 @@
 
     doClear ifTrue:[self clearInsideWith:bg].
 
-    self paint:fg on:bg.
+    gc paint:fg on:bg.
     logo notNil ifTrue:[
         m2 := margin * 2.
         hSep := hSpace*2.
@@ -2024,9 +2022,9 @@
 "/                    self displayString:logo x:x y:y
 "/                ]
                 etchedFg notNil ifTrue:[
-                    self paint:etchedFg.
+                    gc paint:etchedFg.
                     self drawStringLogo:logo x:x+1 y:y+1.
-                    self paint:fg.
+                    gc paint:fg.
                 ].
                 self drawStringLogo:logo x:x y:y
             ] ifFalse:[
@@ -2045,9 +2043,9 @@
 "/                            self displayString:str x:x y:y.
 "/                        ].
                         etchedFg notNil ifTrue:[
-                            self paint:etchedFg.
+                            gc paint:etchedFg.
                             self drawStringLogo:str x:x+1 y:y+1.
-                            self paint:fg.
+                            gc paint:fg.
                         ].
                         self drawStringLogo:str x:x y:y.
                         y := y + (gc font height)