diff --git a/CHANGES.rst b/CHANGES.rst
index 69f4835..c05848d 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,6 +10,9 @@ Changes
 2.2.2 (2022-07-12)
 ------------------
 
+- Fix configlet icon for Plone 6 (#135)
+  [laulaz]
+
 - Use new 'Manage taxonomies' permission for taxonomies configlet (#134)
   Permission is by default assigned to Manager and Site Administrator roles.
   [laulaz]
diff --git a/src/collective/taxonomy/profiles/default/controlpanel.xml b/src/collective/taxonomy/profiles/default/controlpanel.xml
index c65b048..5a1aac6 100644
--- a/src/collective/taxonomy/profiles/default/controlpanel.xml
+++ b/src/collective/taxonomy/profiles/default/controlpanel.xml
@@ -12,7 +12,7 @@
         category="Products"
         condition_expr=""
         url_expr="string:${portal_url}/@@taxonomy-settings"
-        icon_expr="string:$portal_url/product_icon.png"
+        icon_expr="string:puzzle"
         visible="True"
         i18n:attributes="title">
       <permission>Manage taxonomies</permission>
diff --git a/src/collective/taxonomy/upgradesteps.py b/src/collective/taxonomy/upgradesteps.py
index 60f9991..6bc8f94 100644
--- a/src/collective/taxonomy/upgradesteps.py
+++ b/src/collective/taxonomy/upgradesteps.py
@@ -1,6 +1,7 @@
 from logging import getLogger
 from plone import api
 from plone.behavior.interfaces import IBehavior
+from Products.CMFCore.Expression import Expression
 from .interfaces import ITaxonomy
 
 log = getLogger("collective.taxonomy:upgrades")
@@ -47,7 +48,7 @@ def fix_metadata(tool):
                 utility.order[lang] = order
 
 
-def use_new_configlet_permission(tool):
+def update_configlet_properties(tool):
     tool.runImportStepFromProfile(
         "profile-collective.taxonomy:default",
         "rolemap",
@@ -56,3 +57,4 @@ def use_new_configlet_permission(tool):
     for action in pc._actions:
         if action.id == "taxonomies":
             action.permissions = ("Manage taxonomies",)
+            action.icon_expr = Expression("string:puzzle")
diff --git a/src/collective/taxonomy/upgradesteps.zcml b/src/collective/taxonomy/upgradesteps.zcml
index 1204f3c..6058a3f 100644
--- a/src/collective/taxonomy/upgradesteps.zcml
+++ b/src/collective/taxonomy/upgradesteps.zcml
@@ -26,8 +26,8 @@
      source="1005"
      destination="1006">
     <genericsetup:upgradeStep
-       handler=".upgradesteps.use_new_configlet_permission"
-       title="Use new 'Manage taxonomies' permission for configlet"
+       handler=".upgradesteps.update_configlet_properties"
+       title="Use new 'Manage taxonomies' permission / update icon for configlet"
        description=""
        />
   </genericsetup:upgradeSteps>