diff --git a/common/plotters/HPGL_plotter.cpp b/common/plotters/HPGL_plotter.cpp
index c6dd75c86e..15fa21bbfd 100644
--- a/common/plotters/HPGL_plotter.cpp
+++ b/common/plotters/HPGL_plotter.cpp
@@ -465,7 +465,7 @@ void HPGL_PLOTTER::PlotPoly( const std::vector<VECTOR2I>& aCornerList, FILL_T aF
     MoveTo( aCornerList[0] );
     startItem( userToDeviceCoordinates( aCornerList[0] ) );
 
-    if( aFill == FILL_T::FILLED_SHAPE )
+    if( aFill == FILL_T::FILLED_SHAPE || aFill == FILL_T::FILLED_WITH_COLOR )
     {
         // Draw the filled area
         SetCurrentLineWidth( USE_DEFAULT_LINE_WIDTH );
diff --git a/common/plotters/PDF_plotter.cpp b/common/plotters/PDF_plotter.cpp
index 9a76b18f9c..19ea834d25 100644
--- a/common/plotters/PDF_plotter.cpp
+++ b/common/plotters/PDF_plotter.cpp
@@ -222,6 +222,9 @@ void PDF_PLOTTER::Rect( const VECTOR2I& p1, const VECTOR2I& p2, FILL_T fill, int
 {
     wxASSERT( m_workFile );
 
+    if( fill == FILL_T::NO_FILL && width <= 0 )
+        return;
+
     SetCurrentLineWidth( width );
 
     VECTOR2I size = p2 - p1;
@@ -229,8 +232,6 @@ void PDF_PLOTTER::Rect( const VECTOR2I& p1, const VECTOR2I& p2, FILL_T fill, int
     if( size.x == 0 && size.y == 0 )
     {
         // Can't draw zero-sized rectangles
-        SetCurrentLineWidth( width );
-
         MoveTo( VECTOR2I( p1.x, p1.y ) );
         FinishTo( VECTOR2I( p1.x, p1.y ) );
 
@@ -256,14 +257,25 @@ void PDF_PLOTTER::Rect( const VECTOR2I& p1, const VECTOR2I& p2, FILL_T fill, int
     VECTOR2D p1_dev = userToDeviceCoordinates( p1 );
     VECTOR2D p2_dev = userToDeviceCoordinates( p2 );
 
+    char paintOp;
+
+    if( fill == FILL_T::NO_FILL )
+        paintOp = 'S';
+    else
+        paintOp = width > 0 ? 'B' : 'f';
+
     fprintf( m_workFile, "%g %g %g %g re %c\n", p1_dev.x, p1_dev.y, p2_dev.x - p1_dev.x,
-             p2_dev.y - p1_dev.y, fill == FILL_T::NO_FILL ? 'S' : 'B' );
+             p2_dev.y - p1_dev.y, paintOp );
 }
 
 
 void PDF_PLOTTER::Circle( const VECTOR2I& pos, int diametre, FILL_T aFill, int width )
 {
     wxASSERT( m_workFile );
+
+    if( aFill == FILL_T::NO_FILL && width <= 0 )
+        return;
+
     VECTOR2D pos_dev = userToDeviceCoordinates( pos );
     double   radius = userToDeviceSize( diametre / 2.0 );
 
diff --git a/common/plotters/PS_plotter.cpp b/common/plotters/PS_plotter.cpp
index 0b3e1d88a1..981789fe72 100644
--- a/common/plotters/PS_plotter.cpp
+++ b/common/plotters/PS_plotter.cpp
@@ -496,6 +496,9 @@ void PS_PLOTTER::SetDash( int aLineWidth, PLOT_DASH_TYPE aLineStyle )
 
 void PS_PLOTTER::Rect( const VECTOR2I& p1, const VECTOR2I& p2, FILL_T fill, int width )
 {
+    if( fill == FILL_T::NO_FILL && width <= 0 )
+        return;
+
     VECTOR2D p1_dev = userToDeviceCoordinates( p1 );
     VECTOR2D p2_dev = userToDeviceCoordinates( p2 );
 
@@ -507,6 +510,9 @@ void PS_PLOTTER::Rect( const VECTOR2I& p1, const VECTOR2I& p2, FILL_T fill, int
 
 void PS_PLOTTER::Circle( const VECTOR2I& pos, int diametre, FILL_T fill, int width )
 {
+    if( fill == FILL_T::NO_FILL && width <= 0 )
+        return;
+
     wxASSERT( m_outputFile );
     VECTOR2D pos_dev = userToDeviceCoordinates( pos );
     double   radius = userToDeviceSize( diametre / 2.0 );
diff --git a/common/plotters/SVG_plotter.cpp b/common/plotters/SVG_plotter.cpp
index 4456b08514..46a5343416 100644
--- a/common/plotters/SVG_plotter.cpp
+++ b/common/plotters/SVG_plotter.cpp
@@ -220,68 +220,77 @@ void SVG_PLOTTER::setSVGPlotStyle( int aLineWidth, bool aIsGroup, const std::str
     if( aIsGroup )
         fputs( "</g>\n<g ", m_outputFile );
 
-    // output the background fill color
-    fprintf( m_outputFile, "style=\"fill:#%6.6lX; ", m_brush_rgb_color );
+    fputs( "style=\"", m_outputFile );
 
-    switch( m_fillMode )
+    if( m_fillMode == FILL_T::NO_FILL )
     {
-    case FILL_T::NO_FILL:
-        fputs( "fill-opacity:0.0; ", m_outputFile );
-        break;
+        fputs( "fill:none; ", m_outputFile );
+    }
+    else
+    {
+        // output the background fill color
+        fprintf( m_outputFile, "fill:#%6.6lX; ", m_brush_rgb_color );
 
-    case FILL_T::FILLED_SHAPE:
-    case FILL_T::FILLED_WITH_BG_BODYCOLOR:
-    case FILL_T::FILLED_WITH_COLOR:
-        fprintf( m_outputFile, "fill-opacity:%.*f; ", m_precision, m_brush_alpha );
-        break;
+        switch( m_fillMode )
+        {
+        case FILL_T::FILLED_SHAPE:
+        case FILL_T::FILLED_WITH_BG_BODYCOLOR:
+        case FILL_T::FILLED_WITH_COLOR:
+            fprintf( m_outputFile, "fill-opacity:%.*f; ", m_precision, m_brush_alpha );
+            break;
+        default: break;
+        }
     }
 
     double pen_w = userToDeviceSize( aLineWidth );
 
-    if( pen_w < 0.0 )   // Ensure pen width validity
-        pen_w = 0.0;
-
-    // Fix a strange issue found in Inkscape: aWidth < 100 nm create issues on degrouping objects
-    // So we use only 4 digits in mantissa for stroke-width.
-    // TODO: perhaps used only 3 or 4 digits in mantissa for all values in mm, because some
-    // issues were previously reported reported when using nm as integer units
-
-    fprintf( m_outputFile, "\nstroke:#%6.6lX; stroke-width:%.*f; stroke-opacity:1; \n",
-             m_pen_rgb_color, m_precision, pen_w  );
-    fputs( "stroke-linecap:round; stroke-linejoin:round;", m_outputFile );
-
-    //set any extra attributes for non-solid lines
-    switch( m_dashed )
+    if( pen_w <= 0 )
     {
-    case PLOT_DASH_TYPE::DASH:
-        fprintf( m_outputFile, "stroke-dasharray:%.*f,%.*f;",
-                 m_precision, GetDashMarkLenIU( aLineWidth ),
-                 m_precision, GetDashGapLenIU( aLineWidth ) );
-        break;
+        fputs( "stroke:none;", m_outputFile );
+    }
+    else
+    {
+        // Fix a strange issue found in Inkscape: aWidth < 100 nm create issues on degrouping objects
+        // So we use only 4 digits in mantissa for stroke-width.
+        // TODO: perhaps used only 3 or 4 digits in mantissa for all values in mm, because some
+        // issues were previously reported reported when using nm as integer units
 
-    case PLOT_DASH_TYPE::DOT:
-        fprintf( m_outputFile, "stroke-dasharray:%f,%f;",
-                 GetDotMarkLenIU( aLineWidth ), GetDashGapLenIU( aLineWidth ) );
-        break;
+        fprintf( m_outputFile, "\nstroke:#%6.6lX; stroke-width:%.*f; stroke-opacity:1; \n",
+                 m_pen_rgb_color, m_precision, pen_w );
+        fputs( "stroke-linecap:round; stroke-linejoin:round;", m_outputFile );
 
-    case PLOT_DASH_TYPE::DASHDOT:
-        fprintf( m_outputFile, "stroke-dasharray:%f,%f,%f,%f;",
-                 GetDashMarkLenIU( aLineWidth ), GetDashGapLenIU( aLineWidth ),
-                 GetDotMarkLenIU( aLineWidth ), GetDashGapLenIU( aLineWidth ) );
-        break;
+        //set any extra attributes for non-solid lines
+        switch( m_dashed )
+        {
+        case PLOT_DASH_TYPE::DASH:
+            fprintf( m_outputFile, "stroke-dasharray:%.*f,%.*f;", m_precision,
+                     GetDashMarkLenIU( aLineWidth ), m_precision, GetDashGapLenIU( aLineWidth ) );
+            break;
 
-    case PLOT_DASH_TYPE::DASHDOTDOT:
-        fprintf( m_outputFile, "stroke-dasharray:%f,%f,%f,%f,%f,%f;",
-                 GetDashMarkLenIU( aLineWidth ), GetDashGapLenIU( aLineWidth ),
-                 GetDotMarkLenIU( aLineWidth ), GetDashGapLenIU( aLineWidth ),
-                 GetDotMarkLenIU( aLineWidth ), GetDashGapLenIU( aLineWidth ) );
-        break;
+        case PLOT_DASH_TYPE::DOT:
+            fprintf( m_outputFile, "stroke-dasharray:%f,%f;", GetDotMarkLenIU( aLineWidth ),
+                     GetDashGapLenIU( aLineWidth ) );
+            break;
 
-    case PLOT_DASH_TYPE::DEFAULT:
-    case PLOT_DASH_TYPE::SOLID:
-    default:
-        //do nothing
-        break;
+        case PLOT_DASH_TYPE::DASHDOT:
+            fprintf( m_outputFile, "stroke-dasharray:%f,%f,%f,%f;", GetDashMarkLenIU( aLineWidth ),
+                     GetDashGapLenIU( aLineWidth ), GetDotMarkLenIU( aLineWidth ),
+                     GetDashGapLenIU( aLineWidth ) );
+            break;
+
+        case PLOT_DASH_TYPE::DASHDOTDOT:
+            fprintf( m_outputFile, "stroke-dasharray:%f,%f,%f,%f,%f,%f;",
+                     GetDashMarkLenIU( aLineWidth ), GetDashGapLenIU( aLineWidth ),
+                     GetDotMarkLenIU( aLineWidth ), GetDashGapLenIU( aLineWidth ),
+                     GetDotMarkLenIU( aLineWidth ), GetDashGapLenIU( aLineWidth ) );
+            break;
+
+        case PLOT_DASH_TYPE::DEFAULT:
+        case PLOT_DASH_TYPE::SOLID:
+        default:
+            //do nothing
+            break;
+        }
     }
 
     if( aExtraStyle.length() )
diff --git a/eeschema/sch_shape.cpp b/eeschema/sch_shape.cpp
index 3cc1f1c9b9..3ed7aa01dd 100644
--- a/eeschema/sch_shape.cpp
+++ b/eeschema/sch_shape.cpp
@@ -113,7 +113,10 @@ void SCH_SHAPE::Rotate( const VECTOR2I& aCenter )
 
 void SCH_SHAPE::Plot( PLOTTER* aPlotter, bool aBackground ) const
 {
-    int pen_size = std::max( GetPenWidth(), aPlotter->RenderSettings()->GetMinPenWidth() );
+    int pen_size = GetPenWidth();
+
+    if( pen_size > 0 )
+        pen_size = std::max( pen_size, aPlotter->RenderSettings()->GetMinPenWidth() );
 
     static std::vector<VECTOR2I> cornerList;
 
@@ -185,15 +188,7 @@ void SCH_SHAPE::Plot( PLOTTER* aPlotter, bool aBackground ) const
             break;
 
         case SHAPE_T::RECTANGLE:
-        {
-            std::vector<VECTOR2I> pts = GetRectCorners();
-
-            aPlotter->MoveTo( pts[0] );
-            aPlotter->LineTo( pts[1] );
-            aPlotter->LineTo( pts[2] );
-            aPlotter->LineTo( pts[3] );
-            aPlotter->FinishTo( pts[0] );
-        }
+            aPlotter->Rect( GetStart(), GetEnd(), FILL_T::NO_FILL, pen_size );
             break;
 
         case SHAPE_T::POLY: