From 94b694a50c8cf9527683a8c81881fc234893ea5a Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Wed, 29 Sep 2021 08:46:31 +0200
Subject: [PATCH 1/2] add icon_expr to Plone Site typeinfo

---
 .../v60/profiles/to_dx_site_root/types/Plone_Site.xml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/plone/app/upgrade/v60/profiles/to_dx_site_root/types/Plone_Site.xml b/plone/app/upgrade/v60/profiles/to_dx_site_root/types/Plone_Site.xml
index 45278021..b89fca24 100644
--- a/plone/app/upgrade/v60/profiles/to_dx_site_root/types/Plone_Site.xml
+++ b/plone/app/upgrade/v60/profiles/to_dx_site_root/types/Plone_Site.xml
@@ -60,8 +60,14 @@
  <alias from="edit" to="@@edit"/>
  <alias from="sharing" to="@@sharing"/>
  <alias from="view" to="(selected layout)"/>
- <action title="View" action_id="view" category="object" condition_expr=""
-    url_expr="string:${object_url}" visible="True"
+ <action
+    title="View"
+    action_id="view"
+    category="object"
+    condition_expr=""
+    url_expr="string:${object_url}"
+    icon_expr="string:toolbar-action/view"
+    visible="True"
     i18n:attributes="title">
   <permission value="View"/>
  </action>
@@ -72,6 +78,7 @@
     i18n:attributes="title"
     title="Edit"
     url_expr="string:${object_url}/edit"
+    icon_expr="string:toolbar-action/edit"
     visible="True">
   <permission value="Modify portal content"/>
  </action>

From a352d17a16c492aebe5272666db4cc3639af6196 Mon Sep 17 00:00:00 2001
From: Peter Mathis <peter.mathis@kombinat.at>
Date: Wed, 29 Sep 2021 09:35:16 +0200
Subject: [PATCH 2/2] add changenote

---
 news/6001.bugfix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/news/6001.bugfix b/news/6001.bugfix
index a07c0d96..ac09a0be 100644
--- a/news/6001.bugfix
+++ b/news/6001.bugfix
@@ -1,2 +1,5 @@
 Added upgrade to 6001, Plone 6.0.0a1.dev1.
 [maurits]
+
+Fix icon_expr in typeinfo action
+[petschki]