diff --git a/reactos/subsys/win32k/eng/lineto.c b/reactos/subsys/win32k/eng/lineto.c
index 6e6b58454f0..326c662fbce 100644
--- a/reactos/subsys/win32k/eng/lineto.c
+++ b/reactos/subsys/win32k/eng/lineto.c
@@ -22,7 +22,6 @@ BOOL EngLineTo(SURFOBJ *Surface, CLIPOBJ *Clip, BRUSHOBJ *Brush,
   if(Surface->iType!=STYPE_BITMAP)
   {
     // Call the driver's DrvLineTo
-DbgPrint("calling surfgdi's lineto\n");
     return SurfGDI->LineTo(Surface, Clip, Brush, x1, y1, x2, y2, RectBounds, mix);
   }
 
diff --git a/reactos/subsys/win32k/eng/mouse.c b/reactos/subsys/win32k/eng/mouse.c
index 5413949dc89..73f7a5c1862 100644
--- a/reactos/subsys/win32k/eng/mouse.c
+++ b/reactos/subsys/win32k/eng/mouse.c
@@ -92,6 +92,7 @@ void TestMouse()
   PSURFOBJ SurfObj = AccessUserObject(dc->Surface);
   PSURFGDI SurfGDI = AccessInternalObject(dc->Surface);
   BOOL txt;
+  int i;
 
   BRUSHOBJ Brush;
   HBITMAP hMouseSurf;
@@ -101,14 +102,30 @@ void TestMouse()
   RECTL MouseRect;
 
   // Draw a test mouse cursor
-  Brush.iSolidColor = 1;
+/*  Brush.iSolidColor = 1;
   EngLineTo(SurfObj, NULL, &Brush, 0, 0, 15, 0, NULL, 0);
   EngLineTo(SurfObj, NULL, &Brush, 0, 0, 0, 15, NULL, 0);
   EngLineTo(SurfObj, NULL, &Brush, 0, 15, 15, 0, NULL, 0);
   Brush.iSolidColor = 15;
   EngLineTo(SurfObj, NULL, &Brush, 1, 1, 13, 1, NULL, 0);
   EngLineTo(SurfObj, NULL, &Brush, 1, 1, 1, 13, NULL, 0);
-  EngLineTo(SurfObj, NULL, &Brush, 1, 13, 13, 1, NULL, 0);
+  EngLineTo(SurfObj, NULL, &Brush, 1, 13, 13, 1, NULL, 0); */
+
+  // Draw transparent colored rectangle
+  Brush.iSolidColor = 5;
+  for (i = 0; i < 17; i++)
+    EngLineTo(SurfObj, NULL, &Brush, 0, i, 17, i, NULL, 0);
+
+  // Draw white interior
+  Brush.iSolidColor = 15;
+  for (i = 1; i < 16; i++)
+    EngLineTo(SurfObj, NULL, &Brush, 0, i-1, 16-i, i-1, NULL, 0);
+
+  // Draw black outline
+  Brush.iSolidColor = 0;
+  EngLineTo(SurfObj, NULL, &Brush, 0, 0, 15, 0, NULL, 0);
+  EngLineTo(SurfObj, NULL, &Brush, 0, 16, 15, 0, NULL, 0);
+  EngLineTo(SurfObj, NULL, &Brush, 0, 15, 0, 0, NULL, 0);
 
   // Create the bitmap for the mouse cursor data
   MouseSize.cx = 16;
diff --git a/reactos/subsys/win32k/objects/fillshap.c b/reactos/subsys/win32k/objects/fillshap.c
index 98fd04f91bc..8572ef20682 100644
--- a/reactos/subsys/win32k/objects/fillshap.c
+++ b/reactos/subsys/win32k/objects/fillshap.c
@@ -88,10 +88,7 @@ W32kRectangle(HDC  hDC,
   if(PATH_IsPathOpen(dc->w.path)) {
     ret = PATH_Rectangle(hDC, LeftRect, TopRect, RightRect, BottomRect);
   } else {
-
-    DbgPrint("W32kRectangle pen: ");
-    DbgPrint("--- %08x\n", GDIOBJ_HandleToPtr(dc->w.hPen, GO_PEN_MAGIC));
-
+    // Draw the rectangle with the current pen
     BrushObj = PenToBrushObj(dc, GDIOBJ_HandleToPtr(dc->w.hPen, GO_PEN_MAGIC));
 
     ret = EngLineTo(SurfObj,