diff --git a/src/plone/staticresources/upgrades/216.zcml b/src/plone/staticresources/upgrades/216.zcml
index 528414b0c..fb7551e4a 100644
--- a/src/plone/staticresources/upgrades/216.zcml
+++ b/src/plone/staticresources/upgrades/216.zcml
@@ -3,26 +3,12 @@
     xmlns:gs="http://namespaces.zope.org/genericsetup"
     >
 
-  <gs:registerProfile
-      name="216"
-      title="Import PLIP 3211 icon changes"
-      description="Imports plone-rearrange and plone-selection icons for migrated sites"
-      provides="Products.GenericSetup.interfaces.EXTENSION"
-      for="Products.CMFPlone.interfaces.IMigratingPloneSiteRoot"
-      directory="profiles/216"
-      />
-
-  <gs:upgradeSteps
-      profile="plone.staticresources:default"
+  <gs:upgradeStep
       source="215"
       destination="216"
-      >
-
-    <gs:upgradeDepends
-        title="Import plone-rearrange and plone-selection icons"
-        import_profile="plone.staticresources.upgrades:216"
-        />
-
-  </gs:upgradeSteps>
+      title="Import PLIP 3211 icon changes"
+      profile="plone.staticresources:default"
+      handler=".upgrade_v215_to_v216"
+      />
 
 </configure>
diff --git a/src/plone/staticresources/upgrades/__init__.py b/src/plone/staticresources/upgrades/__init__.py
index e69de29bb..71000dd23 100644
--- a/src/plone/staticresources/upgrades/__init__.py
+++ b/src/plone/staticresources/upgrades/__init__.py
@@ -0,0 +1,21 @@
+from plone import api
+from plone.registry import field
+from plone.registry.record import Record
+
+
+def upgrade_v215_to_v216(context):
+    """Import missing icons."""
+
+    registry = api.portal.get_tool('portal_registry')
+
+    if 'plone.icon.plone-rearrange' not in registry.records:
+        registry.records['plone.icon.plone-rearrange'] = Record(
+            field.TextLine(title='Plone Icon rearrange'),
+            '++plone++bootstrap-icons/sort-down-alt.svg'
+        )
+
+    if 'plone.icon.plone-selection' not in registry.records:
+        registry.records['plone.icon.plone-selection'] = Record(
+            field.TextLine(title='Plone Icon selection'),
+            '++plone++bootstrap-icons/list-ul.svg'
+        )
diff --git a/src/plone/staticresources/upgrades/profiles/216/registry/icons_plone.xml b/src/plone/staticresources/upgrades/profiles/216/registry/icons_plone.xml
deleted file mode 100644
index 8cc0f8eac..000000000
--- a/src/plone/staticresources/upgrades/profiles/216/registry/icons_plone.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0"?>
-<registry>
-
-  <record name="plone.icon.plone-rearrange">
-    <field type="plone.registry.field.TextLine">
-      <title>Plone Icon rearrange</title>
-    </field>
-    <value key="resource" purge="false">++plone++bootstrap-icons/sort-down-alt.svg</value>
-  </record>
-
-  <record name="plone.icon.plone-selection">
-    <field type="plone.registry.field.TextLine">
-      <title>Plone Icon selection</title>
-    </field>
-    <value key="resource" purge="false">++plone++bootstrap-icons/list-ul.svg</value>
-  </record>
-
-</registry>