diff --git a/pcbnew/zone_filler.cpp b/pcbnew/zone_filler.cpp
index 58350da91f..b66bfa467f 100644
--- a/pcbnew/zone_filler.cpp
+++ b/pcbnew/zone_filler.cpp
@@ -479,11 +479,17 @@ bool ZONE_FILLER::Fill( std::vector<ZONE*>& aZones, bool aCheck, wxWindow* aPare
 
         for( PCB_LAYER_ID layer : zone.m_zone->GetLayerSet().Seq() )
         {
+            std::shared_ptr<SHAPE_POLY_SET> poly = zone.m_zone->GetFilledPolysList( layer );
+
             if( !zone.m_islands.count( layer ) )
+            {
+                if( poly->OutlineCount() > 0 )
+                    allIslands = false;
+
                 continue;
+            }
 
             std::vector<int>& islands = zone.m_islands.at( layer );
-            std::shared_ptr<SHAPE_POLY_SET> poly = zone.m_zone->GetFilledPolysList( layer );
 
             if( islands.size() != static_cast<size_t>( poly->OutlineCount() ) )
             {
diff --git a/qa/data/pcbnew/connection_width_rules.kicad_pcb b/qa/data/pcbnew/connection_width_rules.kicad_pcb
index b8089dca56..ca6db3157c 100644
--- a/qa/data/pcbnew/connection_width_rules.kicad_pcb
+++ b/qa/data/pcbnew/connection_width_rules.kicad_pcb
@@ -128,7 +128,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks allowed) (vias allowed) (pads allowed) (copperpour allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 118.5418 77.9526)
diff --git a/qa/data/pcbnew/issue12609.kicad_pcb b/qa/data/pcbnew/issue12609.kicad_pcb
index 9769539f22..362eb4f549 100644
--- a/qa/data/pcbnew/issue12609.kicad_pcb
+++ b/qa/data/pcbnew/issue12609.kicad_pcb
@@ -2097,7 +2097,7 @@
     (priority 1)
     (connect_pads (clearance 0.25))
     (min_thickness 0.254) (filled_areas_thickness no)
-    (fill yes (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill yes (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 147 80)
@@ -2753,7 +2753,7 @@
   (zone (net 2) (net_name "GND") (layer "In1.Cu") (tstamp 06f7470f-025c-4658-a456-66fabbc4a1cf) (hatch edge 0.508)
     (connect_pads (clearance 0.25))
     (min_thickness 0.254) (filled_areas_thickness no)
-    (fill yes (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill yes (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 167.5 113.5)
@@ -5032,7 +5032,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks allowed) (vias allowed) (pads allowed) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 162 83.5)
@@ -5046,7 +5046,7 @@
     (priority 1)
     (connect_pads (clearance 0.25))
     (min_thickness 0.254) (filled_areas_thickness no)
-    (fill yes (thermal_gap 0.508) (thermal_bridge_width 0.508) (smoothing fillet) (radius 1) (island_removal_mode 2) (island_area_min 10))
+    (fill yes (thermal_gap 0.508) (thermal_bridge_width 0.508) (smoothing fillet) (radius 1) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 148.5 80)
@@ -5464,7 +5464,7 @@
   (zone (net 5) (net_name "+12V") (layer "In2.Cu") (tstamp a3413c1d-8a1b-44e0-8059-27085646a1a3) (hatch edge 0.508)
     (connect_pads (clearance 0.25))
     (min_thickness 0.254) (filled_areas_thickness no)
-    (fill yes (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill yes (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 167.5 113.5)
@@ -7286,7 +7286,7 @@
     (priority 2)
     (connect_pads yes (clearance 0.25))
     (min_thickness 0.254) (filled_areas_thickness no)
-    (fill yes (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill yes (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 144.75 86.5)
@@ -7328,7 +7328,7 @@
     (priority 1)
     (connect_pads yes (clearance 1))
     (min_thickness 0.254) (filled_areas_thickness no)
-    (fill yes (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill yes (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 167 107.75)
diff --git a/qa/data/pcbnew/plugins/altium/pcblib/Espressif ESP32-WROOM-32.pretty/Espressif ESP32-WROOM-32.kicad_mod b/qa/data/pcbnew/plugins/altium/pcblib/Espressif ESP32-WROOM-32.pretty/Espressif ESP32-WROOM-32.kicad_mod
index eeb5d06792..7346115865 100644
--- a/qa/data/pcbnew/plugins/altium/pcblib/Espressif ESP32-WROOM-32.pretty/Espressif ESP32-WROOM-32.kicad_mod	
+++ b/qa/data/pcbnew/plugins/altium/pcblib/Espressif ESP32-WROOM-32.pretty/Espressif ESP32-WROOM-32.kicad_mod	
@@ -149,7 +149,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy -9 -15)
diff --git a/qa/data/pcbnew/plugins/altium/pcblib/Tracks.pretty/KEEPOUT.kicad_mod b/qa/data/pcbnew/plugins/altium/pcblib/Tracks.pretty/KEEPOUT.kicad_mod
index e58dbe40ae..54d4bef152 100644
--- a/qa/data/pcbnew/plugins/altium/pcblib/Tracks.pretty/KEEPOUT.kicad_mod
+++ b/qa/data/pcbnew/plugins/altium/pcblib/Tracks.pretty/KEEPOUT.kicad_mod
@@ -12,7 +12,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 0.67078 -0.121856)
@@ -36,7 +36,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 0.955135 -0.492465)
diff --git a/qa/data/pcbnew/plugins/altium/pcblib/Tracks.pretty/KEEPOUT_MASKS.kicad_mod b/qa/data/pcbnew/plugins/altium/pcblib/Tracks.pretty/KEEPOUT_MASKS.kicad_mod
index d5dadc4b20..6e984d1b74 100644
--- a/qa/data/pcbnew/plugins/altium/pcblib/Tracks.pretty/KEEPOUT_MASKS.kicad_mod
+++ b/qa/data/pcbnew/plugins/altium/pcblib/Tracks.pretty/KEEPOUT_MASKS.kicad_mod
@@ -16,7 +16,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 0.67078 -0.121856)
@@ -40,7 +40,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 0.955135 -0.492465)
diff --git a/qa/data/pcbnew/plugins/altium/pcblib/Tracks.pretty/KEEP_OUT_LAYER.kicad_mod b/qa/data/pcbnew/plugins/altium/pcblib/Tracks.pretty/KEEP_OUT_LAYER.kicad_mod
index 7e219883fe..96b56ea9da 100644
--- a/qa/data/pcbnew/plugins/altium/pcblib/Tracks.pretty/KEEP_OUT_LAYER.kicad_mod
+++ b/qa/data/pcbnew/plugins/altium/pcblib/Tracks.pretty/KEEP_OUT_LAYER.kicad_mod
@@ -12,7 +12,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks allowed) (vias allowed) (pads allowed ) (copperpour allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 0.67078 -0.121856)
diff --git a/qa/data/pcbnew/plugins/altium/pcblib/Tracks.pretty/KEEP_OUT_LAYER_KEEP_OUT.kicad_mod b/qa/data/pcbnew/plugins/altium/pcblib/Tracks.pretty/KEEP_OUT_LAYER_KEEP_OUT.kicad_mod
index 0104013b1e..012ccb8f81 100644
--- a/qa/data/pcbnew/plugins/altium/pcblib/Tracks.pretty/KEEP_OUT_LAYER_KEEP_OUT.kicad_mod
+++ b/qa/data/pcbnew/plugins/altium/pcblib/Tracks.pretty/KEEP_OUT_LAYER_KEEP_OUT.kicad_mod
@@ -12,7 +12,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 0.67078 -0.121856)
diff --git a/qa/data/pcbnew/plugins/altium/pcblib/Tracks.pretty/KEEP_OUT_LAYER_MASKS.kicad_mod b/qa/data/pcbnew/plugins/altium/pcblib/Tracks.pretty/KEEP_OUT_LAYER_MASKS.kicad_mod
index 9a86df3383..c5d175bbaf 100644
--- a/qa/data/pcbnew/plugins/altium/pcblib/Tracks.pretty/KEEP_OUT_LAYER_MASKS.kicad_mod
+++ b/qa/data/pcbnew/plugins/altium/pcblib/Tracks.pretty/KEEP_OUT_LAYER_MASKS.kicad_mod
@@ -12,7 +12,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks allowed) (vias allowed) (pads allowed ) (copperpour allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 0.67078 -0.121856)
@@ -36,7 +36,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks allowed) (vias allowed) (pads allowed ) (copperpour allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 0.955135 -0.492465)
diff --git a/qa/data/pcbnew/plugins/altium/pcblib/Tracks.pretty/MULTI_LAYER_KEEP_OUT.kicad_mod b/qa/data/pcbnew/plugins/altium/pcblib/Tracks.pretty/MULTI_LAYER_KEEP_OUT.kicad_mod
index 21b9329457..9b73dfb4f3 100644
--- a/qa/data/pcbnew/plugins/altium/pcblib/Tracks.pretty/MULTI_LAYER_KEEP_OUT.kicad_mod
+++ b/qa/data/pcbnew/plugins/altium/pcblib/Tracks.pretty/MULTI_LAYER_KEEP_OUT.kicad_mod
@@ -12,7 +12,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 0.67078 -0.121856)
diff --git a/qa/data/pcbnew/plugins/eagle/lbr/SparkFun-GPS.pretty/MLOEX_GNSS_MOLDED.kicad_mod b/qa/data/pcbnew/plugins/eagle/lbr/SparkFun-GPS.pretty/MLOEX_GNSS_MOLDED.kicad_mod
index 2fd2313df3..40c8b71135 100644
--- a/qa/data/pcbnew/plugins/eagle/lbr/SparkFun-GPS.pretty/MLOEX_GNSS_MOLDED.kicad_mod
+++ b/qa/data/pcbnew/plugins/eagle/lbr/SparkFun-GPS.pretty/MLOEX_GNSS_MOLDED.kicad_mod
@@ -64,7 +64,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy -2.64 1.2)
@@ -78,7 +78,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy -2.64 3.735)
@@ -92,7 +92,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 0.2 3.735)
@@ -106,7 +106,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy -2.64 3.735)
diff --git a/qa/data/pcbnew/plugins/eagle/lbr/SparkFun-GPS.pretty/MOLEX_GNSS_CHIP.kicad_mod b/qa/data/pcbnew/plugins/eagle/lbr/SparkFun-GPS.pretty/MOLEX_GNSS_CHIP.kicad_mod
index 2cf372a661..f844a35e6f 100644
--- a/qa/data/pcbnew/plugins/eagle/lbr/SparkFun-GPS.pretty/MOLEX_GNSS_CHIP.kicad_mod
+++ b/qa/data/pcbnew/plugins/eagle/lbr/SparkFun-GPS.pretty/MOLEX_GNSS_CHIP.kicad_mod
@@ -48,7 +48,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy -2 -1)
@@ -62,7 +62,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy -2 0.2)
@@ -76,7 +76,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy -0.8 1)
@@ -90,7 +90,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy -2 1)
diff --git a/qa/data/pcbnew/plugins/eagle/lbr/SparkFun-GPS.pretty/MOLEX_GNSS_CUBE.kicad_mod b/qa/data/pcbnew/plugins/eagle/lbr/SparkFun-GPS.pretty/MOLEX_GNSS_CUBE.kicad_mod
index ac81d3bdb5..1173932bd2 100644
--- a/qa/data/pcbnew/plugins/eagle/lbr/SparkFun-GPS.pretty/MOLEX_GNSS_CUBE.kicad_mod
+++ b/qa/data/pcbnew/plugins/eagle/lbr/SparkFun-GPS.pretty/MOLEX_GNSS_CUBE.kicad_mod
@@ -87,7 +87,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 2.845 6.95)
@@ -101,7 +101,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 2.875 4.5)
@@ -115,7 +115,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 3.795 6.95)
@@ -129,7 +129,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 4.125 4.45)
@@ -143,7 +143,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 4.225 6.95)
@@ -157,7 +157,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 4.6 4.525)
@@ -171,7 +171,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 6.25 2.725)
@@ -185,7 +185,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 6.25 4.425)
diff --git a/qa/data/pcbnew/plugins/eagle/lbr/SparkFun-GPS.pretty/W3011.kicad_mod b/qa/data/pcbnew/plugins/eagle/lbr/SparkFun-GPS.pretty/W3011.kicad_mod
index 0e5a77dbfd..6d64e1dbc3 100644
--- a/qa/data/pcbnew/plugins/eagle/lbr/SparkFun-GPS.pretty/W3011.kicad_mod
+++ b/qa/data/pcbnew/plugins/eagle/lbr/SparkFun-GPS.pretty/W3011.kicad_mod
@@ -42,7 +42,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy -2 -1)
@@ -56,7 +56,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy -2 1.2)
@@ -70,7 +70,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy -1 1)
@@ -84,7 +84,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy -2 1.25)
diff --git a/qa/data/pcbnew/plugins/eagle/lbr/SparkFun-GPS.pretty/W3062A.kicad_mod b/qa/data/pcbnew/plugins/eagle/lbr/SparkFun-GPS.pretty/W3062A.kicad_mod
index 713b09e4fb..096e4926f0 100644
--- a/qa/data/pcbnew/plugins/eagle/lbr/SparkFun-GPS.pretty/W3062A.kicad_mod
+++ b/qa/data/pcbnew/plugins/eagle/lbr/SparkFun-GPS.pretty/W3062A.kicad_mod
@@ -58,7 +58,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy -3.9 -0.8)
@@ -72,7 +72,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy -3.9 -0.6)
@@ -86,7 +86,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy -3.9 0.8)
@@ -100,7 +100,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy -3.9 2.6)
@@ -114,7 +114,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy -2.3 0.8)
@@ -128,7 +128,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 3.5 -0.6)
@@ -142,7 +142,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 3.5 0.8)
@@ -156,7 +156,7 @@
     (connect_pads (clearance 0))
     (min_thickness 0.254) (filled_areas_thickness no)
     (keepout (tracks not_allowed) (vias not_allowed) (pads not_allowed ) (copperpour not_allowed) (footprints allowed))
-    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy -3.9 2.625)
diff --git a/qa/data/pcbnew/pns_regressions/simple_shove1/pns.dump b/qa/data/pcbnew/pns_regressions/simple_shove1/pns.dump
index 6d7513924c..4c5101f629 100644
--- a/qa/data/pcbnew/pns_regressions/simple_shove1/pns.dump
+++ b/qa/data/pcbnew/pns_regressions/simple_shove1/pns.dump
@@ -2260,7 +2260,7 @@
   (zone (net 1) (net_name "GND") (layer "B.Cu") (tstamp 754c1c43-ce1c-402f-8633-c6299f05323c) (hatch edge 0.508)
     (connect_pads (clearance 0.508))
     (min_thickness 0.254) (filled_areas_thickness no)
-    (fill yes (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 2) (island_area_min 10))
+    (fill yes (thermal_gap 0.508) (thermal_bridge_width 0.508) (island_removal_mode 0) (island_area_min 10))
     (polygon
       (pts
         (xy 185 125)