diff --git a/common/advanced_config.cpp b/common/advanced_config.cpp
index 0d9d746c1e..9fdaeae575 100644
--- a/common/advanced_config.cpp
+++ b/common/advanced_config.cpp
@@ -90,11 +90,6 @@ static const wxChar AllowLegacyCanvasInGtk3[] = wxT( "AllowLegacyCanvasInGtk3" )
  */
 static const wxChar CoroutineStackSize[] = wxT( "CoroutineStackSize" );
 
-/**
- * Draw zones in pcbnew with the stroked outline.
- */
-static const wxChar ForceThickZones[] = wxT( "ForceThickZones" );
-
 } // namespace KEYS
 
 
@@ -175,7 +170,6 @@ ADVANCED_CFG::ADVANCED_CFG()
     m_enableSvgImport = false;
     m_allowLegacyCanvasInGtk3 = false;
     m_realTimeConnectivity = true;
-    m_forceThickOutlinesInZones = true;
     m_coroutineStackSize = AC_STACK::default_stack;
 
     loadFromConfigFile();
@@ -223,9 +217,6 @@ void ADVANCED_CFG::loadSettings( wxConfigBase& aCfg )
             new PARAM_CFG_INT( true, AC_KEYS::CoroutineStackSize, &m_coroutineStackSize,
                     AC_STACK::default_stack, AC_STACK::min_stack, AC_STACK::max_stack ) );
 
-    configParams.push_back( new PARAM_CFG_BOOL( true, AC_KEYS::ForceThickZones,
-                                                &m_forceThickOutlinesInZones, true ) );
-
     wxConfigLoadSetups( &aCfg, configParams );
 
     dumpCfg( configParams );
diff --git a/include/advanced_config.h b/include/advanced_config.h
index 824e9b0539..38821982ed 100644
--- a/include/advanced_config.h
+++ b/include/advanced_config.h
@@ -78,12 +78,6 @@ public:
      */
     bool m_realTimeConnectivity;
 
-    /**
-     * Force filled polygons with outlines in zone -- To be removed after testing
-     * default = true (legacy mode)
-     */
-    bool m_forceThickOutlinesInZones;
-
     /**
      * Set the stack size for coroutines
      */
diff --git a/pcbnew/dialogs/panel_setup_feature_constraints.cpp b/pcbnew/dialogs/panel_setup_feature_constraints.cpp
index 79188c856a..99fe1b7a67 100644
--- a/pcbnew/dialogs/panel_setup_feature_constraints.cpp
+++ b/pcbnew/dialogs/panel_setup_feature_constraints.cpp
@@ -45,10 +45,6 @@ PANEL_SETUP_FEATURE_CONSTRAINTS::PANEL_SETUP_FEATURE_CONSTRAINTS( PAGED_DIALOG*
 {
     m_Frame = aFrame;
     m_BrdSettings = &m_Frame->GetBoard()->GetDesignSettings();
-
-    // Temporary option: allows zone fill option only if the advanced config option allow it
-    if( ADVANCED_CFG::GetCfg().m_forceThickOutlinesInZones )
-        m_bSizerPolygonFillOption->Show( false );
 }
 
 
diff --git a/pcbnew/zone_filler.cpp b/pcbnew/zone_filler.cpp
index cceffd6249..750cf6e274 100644
--- a/pcbnew/zone_filler.cpp
+++ b/pcbnew/zone_filler.cpp
@@ -105,9 +105,6 @@ bool ZONE_FILLER::Fill( const std::vector<ZONE_CONTAINER*>& aZones, bool aCheck
     auto connectivity = m_board->GetConnectivity();
     bool filledPolyWithOutline = not m_board->GetDesignSettings().m_ZoneUseNoOutlineInFill;
 
-    if( ADVANCED_CFG::GetCfg().m_forceThickOutlinesInZones )
-        filledPolyWithOutline = true;
-
     std::unique_lock<std::mutex> lock( connectivity->GetLock(), std::try_to_lock );
 
     if( !lock )