diff --git a/common/draw_panel.cpp b/common/draw_panel.cpp
index 7d66608..66e2d77 100644
--- a/common/draw_panel.cpp
+++ b/common/draw_panel.cpp
@@ -667,12 +667,10 @@ void EDA_DRAW_PANEL::DrawBackGround( wxDC* DC )
         wxSize  pageSize = GetParent()->GetPageSizeIU();
 
         // Draw the Y axis
-        GRDashedLine( &m_ClipBox, DC, 0, -pageSize.y,
-                      0, pageSize.y, 0, axis_color );
+        GRLine( &m_ClipBox, DC, 0, -pageSize.y, 0, pageSize.y, 0, axis_color );
 
         // Draw the X axis
-        GRDashedLine( &m_ClipBox, DC, -pageSize.x, 0,
-                      pageSize.x, 0, 0, axis_color );
+        GRLine( &m_ClipBox, DC, -pageSize.x, 0, pageSize.x, 0, 0, axis_color );
     }
 
     if( GetParent()->m_showOriginAxis )
diff --git a/common/gr_basic.cpp b/common/gr_basic.cpp
index 002b242..dbd0fa1 100644
--- a/common/gr_basic.cpp
+++ b/common/gr_basic.cpp
@@ -364,8 +364,6 @@ void GRLine( EDA_RECT* ClipBox,
 {
     GRSetColorPen( DC, Color, width );
     WinClipAndDrawLine( ClipBox, DC, x1, y1, x2, y2, width );
-    GRLastMoveToX = x2;
-    GRLastMoveToY = y2;
 }
 
 
@@ -377,13 +375,9 @@ void GRLine( EDA_RECT* aClipBox, wxDC* aDC, wxPoint aStart, wxPoint aEnd, int aW
 
 void GRDashedLineTo( EDA_RECT* ClipBox, wxDC* DC, int x2, int y2, int width, EDA_COLOR_T Color )
 {
-    s_DC_lastcolor = UNSPECIFIED_COLOR;
     GRSetColorPen( DC, Color, width, wxPENSTYLE_SHORT_DASH );
     WinClipAndDrawLine( ClipBox, DC, GRLastMoveToX, GRLastMoveToY, x2, y2, width );
-    s_DC_lastcolor = UNSPECIFIED_COLOR;
     GRSetColorPen( DC, Color, width );
-    GRLastMoveToX = x2;
-    GRLastMoveToY = y2;
 }
 
 
@@ -396,12 +390,8 @@ void GRDashedLine( EDA_RECT* ClipBox,
                    int       width,
                    EDA_COLOR_T Color )
 {
-    GRLastMoveToX  = x2;
-    GRLastMoveToY  = y2;
-    s_DC_lastcolor = UNSPECIFIED_COLOR;
     GRSetColorPen( DC, Color, width, wxPENSTYLE_SHORT_DASH );
     WinClipAndDrawLine( ClipBox, DC, x1, y1, x2, y2, width );
-    s_DC_lastcolor = UNSPECIFIED_COLOR;
     GRSetColorPen( DC, Color, width );
 }