diff --git a/news/337.bugfix b/news/337.bugfix
new file mode 100644
index 000000000..df46858e3
--- /dev/null
+++ b/news/337.bugfix
@@ -0,0 +1,2 @@
+- Fix missing folder_contents icons in classic UI after migration from Plone 5 - see also plone/Prodcuts.CMFPlone#3838
+[szakitibi]
diff --git a/src/plone/staticresources/profiles/default/metadata.xml b/src/plone/staticresources/profiles/default/metadata.xml
index 9977272d6..2c0e844be 100644
--- a/src/plone/staticresources/profiles/default/metadata.xml
+++ b/src/plone/staticresources/profiles/default/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metadata>
-  <version>215</version>
+  <version>216</version>
   <dependencies>
     <dependency>profile-plone.resource:default</dependency>
   </dependencies>
diff --git a/src/plone/staticresources/upgrades/216.zcml b/src/plone/staticresources/upgrades/216.zcml
new file mode 100644
index 000000000..fb7551e4a
--- /dev/null
+++ b/src/plone/staticresources/upgrades/216.zcml
@@ -0,0 +1,14 @@
+<configure
+    xmlns="http://namespaces.zope.org/zope"
+    xmlns:gs="http://namespaces.zope.org/genericsetup"
+    >
+
+  <gs:upgradeStep
+      source="215"
+      destination="216"
+      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/configure.zcml b/src/plone/staticresources/upgrades/configure.zcml
index 3e623fc90..8b48b0392 100644
--- a/src/plone/staticresources/upgrades/configure.zcml
+++ b/src/plone/staticresources/upgrades/configure.zcml
@@ -26,5 +26,6 @@
   <include file="213.zcml" />
   <include file="214.zcml" />
   <include file="215.zcml" />
+  <include file="216.zcml" />
 
 </configure>