diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64f238e6..03fb56aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,6 +10,7 @@ CHANGELOG for FlatCAM beta
 10.01.2022
 
 - added a new feature in Preferences -> Gerber: a Layer Color Manager where the user can set and edit predefined colors for the Gerber objects: loading order matter
+- fixed and error in the Isolation Plugin when using the pad multi-isolations and area isolation simultaneously
 
 9.01.2022
 
diff --git a/appPlugins/ToolIsolation.py b/appPlugins/ToolIsolation.py
index 85e075d9..9842eb2a 100644
--- a/appPlugins/ToolIsolation.py
+++ b/appPlugins/ToolIsolation.py
@@ -2218,8 +2218,9 @@ class ToolIsolation(AppTool, Gerber):
                 extra_geo = []
                 for apid in self.grb_obj.tools:
                     for t_geo_dict in self.grb_obj.tools[apid]['geometry']:
-                        if isinstance(t_geo_dict['follow'], Point):
-                            extra_geo.append(t_geo_dict['solid'])
+                        if 'follow' in t_geo_dict:
+                            if isinstance(t_geo_dict['follow'], Point):
+                                extra_geo.append(t_geo_dict['solid'])
 
                 for nr_pass in range(passes, extra_passes + passes):
                     pad_pass_geo = []
diff --git a/assets/resources/dark_resources/set_colors64.png b/assets/resources/dark_resources/set_colors64.png
new file mode 100644
index 00000000..fcc10dc7
Binary files /dev/null and b/assets/resources/dark_resources/set_colors64.png differ
diff --git a/assets/resources/set_colors64.png b/assets/resources/set_colors64.png
new file mode 100644
index 00000000..fcc10dc7
Binary files /dev/null and b/assets/resources/set_colors64.png differ