diff --git a/diagrams/gis/toolkit.py b/diagrams/gis/toolkit.py
new file mode 100644
index 000000000..d81e12905
--- /dev/null
+++ b/diagrams/gis/toolkit.py
@@ -0,0 +1,15 @@
+# This module is automatically generated by autogen.sh. DO NOT EDIT.
+
+from . import _GIS
+
+
+class _Toolkit(_GIS):
+    _type = "toolkit"
+    _icon_dir = "resources/gis/toolkit"
+
+
+class Mapnik(_Toolkit):
+    _icon = "mapnik.png"
+
+
+# Aliases
diff --git a/diagrams/onprem/certificates.py b/diagrams/onprem/certificates.py
index fc6455892..030e8a42a 100644
--- a/diagrams/onprem/certificates.py
+++ b/diagrams/onprem/certificates.py
@@ -12,10 +12,6 @@ class CertManager(_Certificates):
     _icon = "cert-manager.png"
 
 
-class Certbot(_Certificates):
-    _icon = "certbot.png"
-
-
 class LetsEncrypt(_Certificates):
     _icon = "lets-encrypt.png"
 
diff --git a/docs/nodes/gis.md b/docs/nodes/gis.md
index f859b0898..d5f45fc22 100644
--- a/docs/nodes/gis.md
+++ b/docs/nodes/gis.md
@@ -23,12 +23,6 @@ Node classes list of the gis provider.
 <img width="30" src="/img/resources/gis/cli/pdal.png" alt="Pdal" style="float: left; padding-right: 5px;" >
 **diagrams.gis.cli.Pdal**
 
-## gis.cplusplus
-
-
-<img width="30" src="/img/resources/gis/cplusplus/mapnik.png" alt="Mapnik" style="float: left; padding-right: 5px;" >
-**diagrams.gis.cplusplus.Mapnik**
-
 ## gis.data
 
 
@@ -241,3 +235,9 @@ Node classes list of the gis provider.
 
 <img width="30" src="/img/resources/gis/server/zooproject.png" alt="Zooproject" style="float: left; padding-right: 5px;" >
 **diagrams.gis.server.Zooproject**
+
+## 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/docs/nodes/onprem.md b/docs/nodes/onprem.md
index 52e57591e..149ebf909 100644
--- a/docs/nodes/onprem.md
+++ b/docs/nodes/onprem.md
@@ -98,9 +98,6 @@ Node classes list of the onprem provider.
 <img width="30" src="/img/resources/onprem/certificates/cert-manager.png" alt="CertManager" style="float: left; padding-right: 5px;" >
 **diagrams.onprem.certificates.CertManager**
 
-<img width="30" src="/img/resources/onprem/certificates/certbot.png" alt="Certbot" style="float: left; padding-right: 5px;" >
-**diagrams.onprem.certificates.Certbot**
-
 <img width="30" src="/img/resources/onprem/certificates/lets-encrypt.png" alt="LetsEncrypt" style="float: left; padding-right: 5px;" >
 **diagrams.onprem.certificates.LetsEncrypt**
 
diff --git a/resources/cas.png b/resources/cas.png
deleted file mode 100644
index 1f69615ff..000000000
Binary files a/resources/cas.png and /dev/null differ
diff --git a/resources/gis/cli/mdal.png b/resources/gis/cli/mdal.png
index f353f4638..b1e1ed400 100644
Binary files a/resources/gis/cli/mdal.png and b/resources/gis/cli/mdal.png differ
diff --git a/resources/gis/desktop/maptunik.png b/resources/gis/desktop/maptunik.png
index cd0df71e9..4710e80f8 100644
Binary files a/resources/gis/desktop/maptunik.png and b/resources/gis/desktop/maptunik.png differ
diff --git a/resources/gis/geocoding/pelias.png b/resources/gis/geocoding/pelias.png
index 2f8350e21..6037fdeca 100644
Binary files a/resources/gis/geocoding/pelias.png and b/resources/gis/geocoding/pelias.png differ
diff --git a/resources/gis/mobile/smash.png b/resources/gis/mobile/smash.png
index e9fd8bbed..38256c378 100644
Binary files a/resources/gis/mobile/smash.png and b/resources/gis/mobile/smash.png differ
diff --git a/resources/gis/server/kepler.png b/resources/gis/server/kepler.png
index 69b198e01..23e1428ef 100644
Binary files a/resources/gis/server/kepler.png and b/resources/gis/server/kepler.png differ
diff --git a/resources/gis/cplusplus/mapnik.png b/resources/gis/toolkit/mapnik.png
similarity index 100%
rename from resources/gis/cplusplus/mapnik.png
rename to resources/gis/toolkit/mapnik.png
diff --git a/resources/onprem/certificates/certbot.png b/resources/onprem/certificates/certbot.png
deleted file mode 100644
index 9659a81b5..000000000
Binary files a/resources/onprem/certificates/certbot.png and /dev/null differ
diff --git a/resources/openldap.png b/resources/openldap.png
deleted file mode 100644
index c55718f80..000000000
Binary files a/resources/openldap.png and /dev/null differ
diff --git a/website/static/img/resources/gis/cli/mdal.png b/website/static/img/resources/gis/cli/mdal.png
index f353f4638..b1e1ed400 100644
Binary files a/website/static/img/resources/gis/cli/mdal.png and b/website/static/img/resources/gis/cli/mdal.png differ
diff --git a/website/static/img/resources/gis/desktop/maptunik.png b/website/static/img/resources/gis/desktop/maptunik.png
index cd0df71e9..4710e80f8 100644
Binary files a/website/static/img/resources/gis/desktop/maptunik.png and b/website/static/img/resources/gis/desktop/maptunik.png differ
diff --git a/website/static/img/resources/gis/geocoding/pelias.png b/website/static/img/resources/gis/geocoding/pelias.png
index 2f8350e21..6037fdeca 100644
Binary files a/website/static/img/resources/gis/geocoding/pelias.png and b/website/static/img/resources/gis/geocoding/pelias.png differ
diff --git a/website/static/img/resources/gis/mobile/smash.png b/website/static/img/resources/gis/mobile/smash.png
index e9fd8bbed..38256c378 100644
Binary files a/website/static/img/resources/gis/mobile/smash.png and b/website/static/img/resources/gis/mobile/smash.png differ
diff --git a/website/static/img/resources/gis/server/kepler.png b/website/static/img/resources/gis/server/kepler.png
index 69b198e01..23e1428ef 100644
Binary files a/website/static/img/resources/gis/server/kepler.png and b/website/static/img/resources/gis/server/kepler.png differ
diff --git a/website/static/img/resources/gis/toolkit/mapnik.png b/website/static/img/resources/gis/toolkit/mapnik.png
new file mode 100644
index 000000000..622cacf40
Binary files /dev/null and b/website/static/img/resources/gis/toolkit/mapnik.png differ