diff --git a/CHANGES.txt b/CHANGES.txt
index a19a3e0..f6b41ce 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,6 +4,10 @@ Changelog
 1.0RC1 (unreleased)
 -------------------
 
+- Move discussion action item from actionicons.xml to actions.xml to avoid 
+  deprecation warning.
+  [timo]
+  
 - Fix cancel button on edit view when using Dexterity types. This fixes 
   http://dev.plone.org/plone/ticket/11338.
   [EpeliJYU]
diff --git a/plone/app/discussion/profiles/default/actionicons.xml b/plone/app/discussion/profiles/default/actionicons.xml
deleted file mode 100644
index ac662ee..0000000
--- a/plone/app/discussion/profiles/default/actionicons.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0"?>
-<action-icons xmlns:i18n="http://xml.zope.org/namespaces/i18n"
-    i18n:domain="plone">
- <action-icon category="controlpanel" action_id="discussion"
-              title="Discussion" priority="0"
-              icon_expr="discussionitem_icon.gif"
-              i18n:attributes="title"/>
-</action-icons>
diff --git a/plone/app/discussion/profiles/default/actions.xml b/plone/app/discussion/profiles/default/actions.xml
index e3f6876..b33d40b 100644
--- a/plone/app/discussion/profiles/default/actions.xml
+++ b/plone/app/discussion/profiles/default/actions.xml
@@ -6,7 +6,7 @@
    <property name="title" i18n:translate="">Moderate comments</property>
    <property name="description" i18n:translate=""></property>
    <property name="url_expr">string:${globals_view/navigationRootUrl}/@@moderate-comments</property>
-   <property name="icon_expr"></property>
+   <property name="icon_expr">string:${globals_view/navigationRootUrl}/discussionitem_icon.gif</property>
    <property name="available_expr">portal/@@moderate-comments-enabled|nothing</property>
    <property name="permissions">
     <element value="Review comments"/>