diff --git a/pcbnew/pcb_painter.cpp b/pcbnew/pcb_painter.cpp
index 4fd667b07e..f0dd7a7b11 100644
--- a/pcbnew/pcb_painter.cpp
+++ b/pcbnew/pcb_painter.cpp
@@ -916,6 +916,7 @@ void PCB_PAINTER::draw( const PCB_VIA* aVia, int aLayer )
         {
             draw = true;
             outline_mode = true;
+            m_gal->SetLineWidth( m_pcbSettings.m_outlineWidth );
         }
 
         if( !outline_mode )
@@ -1234,6 +1235,15 @@ void PCB_PAINTER::draw( const PAD* aPad, int aLayer )
         outline_mode = true;
     }
 
+    if( outline_mode )
+    {
+        // Outline mode
+        m_gal->SetIsFill( false );
+        m_gal->SetIsStroke( true );
+        m_gal->SetLineWidth( m_pcbSettings.m_outlineWidth );
+        m_gal->SetStrokeColor( color );
+    }
+
     if( drawShape )
     {
         VECTOR2I pad_size = aPad->GetSize();