Add icon also via add_to and add_child

Author: hansthen

folium/map.py

@@ -408,8 +408,7 @@ def __init__(
         # this attribute is not used by Marker, but by GeoJson
         self.icon = None
         if icon is not None:
-            self.add_child(icon)
-            self.icon = icon
+            self.set_icon(icon)
         if popup is not None:
             self.add_child(popup if isinstance(popup, Popup) else Popup(str(popup)))
         if tooltip is not None:
@@ -434,6 +433,19 @@ def render(self):
             self.add_child(self.SetIcon(marker=self, icon=self.icon))
         super().render()
 
+    def set_icon(self, icon: Union[Icon, "CustomIcon", "DivIcon"]):
+        """Set the icon for this Marker"""
+        super().add_child(icon)
+        self.icon = icon
+
+    def add_child(self, child, name=None, index=None):
+        import folium.features as features
+
+        if isinstance(child, (Icon, features.CustomIcon, features.DivIcon)):
+            self.set_icon(child)
+        else:
+            super().add_child(child, name, index)
+
 
 class Popup(MacroElement):
     """Create a Popup instance that can be linked to a Layer.