diff --git a/news/+icon.bugfix b/news/+icon.bugfix
new file mode 100644
index 00000000..13375649
--- /dev/null
+++ b/news/+icon.bugfix
@@ -0,0 +1 @@
+Use icon class name @erral
diff --git a/src/plone/app/discussion/profiles/default/actions.xml b/src/plone/app/discussion/profiles/default/actions.xml
index 395f5e5e..995f443e 100644
--- a/src/plone/app/discussion/profiles/default/actions.xml
+++ b/src/plone/app/discussion/profiles/default/actions.xml
@@ -17,7 +17,7 @@
                 i18n:translate=""
       />
       <property name="url_expr">string:${globals_view/navigationRootUrl}/@@moderate-comments</property>
-      <property name="icon_expr">string:${globals_view/navigationRootUrl}/discussionitem_icon.png</property>
+      <property name="icon_expr">string:chat</property>
       <property name="available_expr">portal/@@moderate-comments-enabled|nothing</property>
       <property name="permissions">
         <element value="Review comments" />
diff --git a/src/plone/app/discussion/profiles/default/metadata.xml b/src/plone/app/discussion/profiles/default/metadata.xml
index 15f3d34a..a610db26 100644
--- a/src/plone/app/discussion/profiles/default/metadata.xml
+++ b/src/plone/app/discussion/profiles/default/metadata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <metadata>
-  <version>3000</version>
+  <version>3001</version>
   <dependencies>
     <dependency>profile-plone.resource:default</dependency>
     <dependency>profile-plone.app.registry:default</dependency>
diff --git a/src/plone/app/discussion/upgrades.py b/src/plone/app/discussion/upgrades.py
index a60ef577..432e45f3 100644
--- a/src/plone/app/discussion/upgrades.py
+++ b/src/plone/app/discussion/upgrades.py
@@ -119,3 +119,33 @@ def set_timezone_on_dates(context):
 def set_discussion_behavior(context):
     """Add the discussion behavior to all default types, if they exist."""
     add_discussion_behavior_to_default_types(context)
+
+
+def manage_comments_icon(context):
+    """if plone.app.discussion is installed, set the manage-comments action icon
+    expression from its default to the bootstrap based new-style icons
+    """
+
+    portal_actions = getToolByName(context, "portal_actions")
+    user_actions = getattr(portal_actions, "user", None)
+    if user_actions is None:
+        logger.info("There are no user actions. Nothing is done.")
+        return
+
+    review_comments_action = getattr(user_actions, "review-comments", None)
+    if review_comments_action is None:
+        logger.info("There is no manage comments action. Nothing is done.")
+        return
+
+    # Check whether the action keeps its original state
+    if (
+        review_comments_action.icon_expr
+        != "string:${globals_view/navigationRootUrl}/discussionitem_icon.png"
+    ):
+        logger.info(
+            "Manage comments action icon was modified by the user. Nothing is done."
+        )
+        return
+
+    review_comments_action.icon_expr = "string:chat"
+    logger.info("Manage comments action icon modified")
diff --git a/src/plone/app/discussion/upgrades.zcml b/src/plone/app/discussion/upgrades.zcml
index 129b73ee..801e64a7 100644
--- a/src/plone/app/discussion/upgrades.zcml
+++ b/src/plone/app/discussion/upgrades.zcml
@@ -132,4 +132,18 @@
         />
   </genericsetup:upgradeSteps>
 
+
+  <genericsetup:upgradeSteps
+      profile="plone.app.discussion:default"
+      source="3000"
+      destination="3001"
+      >
+
+    <genericsetup:upgradeStep
+        title="Use Bootstrap style icon for discussion moderation action."
+        handler=".upgrades.manage_comments_icon"
+        />
+
+  </genericsetup:upgradeSteps>
+
 </configure>