diff --git a/diagrams/gis/cli.py b/diagrams/gis/cli.py
index 5ef240e2..4cf8e9f1 100644
--- a/diagrams/gis/cli.py
+++ b/diagrams/gis/cli.py
@@ -20,6 +20,10 @@ class Lastools(_Cli):
     _icon = "lastools.png"
 
 
+class Mapnik(_Cli):
+    _icon = "mapnik.png"
+
+
 class Mdal(_Cli):
     _icon = "mdal.png"
 
diff --git a/diagrams/gis/toolkit.py b/diagrams/gis/toolkit.py
index d81e1290..d67d1d81 100644
--- a/diagrams/gis/toolkit.py
+++ b/diagrams/gis/toolkit.py
@@ -8,8 +8,4 @@ class _Toolkit(_GIS):
     _icon_dir = "resources/gis/toolkit"
 
 
-class Mapnik(_Toolkit):
-    _icon = "mapnik.png"
-
-
 # Aliases
diff --git a/docs/nodes/gis.md b/docs/nodes/gis.md
index d5f45fc2..ba917d10 100644
--- a/docs/nodes/gis.md
+++ b/docs/nodes/gis.md
@@ -17,6 +17,9 @@ Node classes list of the gis provider.
 <img width="30" src="/img/resources/gis/cli/lastools.png" alt="Lastools" style="float: left; padding-right: 5px;" >
 **diagrams.gis.cli.Lastools**
 
+<img width="30" src="/img/resources/gis/cli/mapnik.png" alt="Mapnik" style="float: left; padding-right: 5px;" >
+**diagrams.gis.cli.Mapnik**
+
 <img width="30" src="/img/resources/gis/cli/mdal.png" alt="Mdal" style="float: left; padding-right: 5px;" >
 **diagrams.gis.cli.Mdal**
 
@@ -238,6 +241,3 @@ Node classes list of the gis provider.
 
 ## gis.toolkit
 
-
-<img width="30" src="/img/resources/gis/toolkit/mapnik.png" alt="Mapnik" style="float: left; padding-right: 5px;" >
-**diagrams.gis.toolkit.Mapnik**
diff --git a/website/static/img/resources/gis/cli/mapnik.png b/website/static/img/resources/gis/cli/mapnik.png
new file mode 100644
index 00000000..622cacf4
Binary files /dev/null and b/website/static/img/resources/gis/cli/mapnik.png differ
diff --git a/website/static/img/resources/gis/gis.png b/website/static/img/resources/gis/gis.png
new file mode 100644
index 00000000..95e4a2ef
Binary files /dev/null and b/website/static/img/resources/gis/gis.png differ