diff --git a/CHANGES.txt b/CHANGES.txt
index 03c6022..371a408 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -4,7 +4,8 @@ Changelog
 2.2.1 (unreleased)
 ------------------
 
-- Nothing changed yet.
+- Replace discussionitem_icon.gif with png version.
+  [timo]
 
 
 2.2.0 (2012-08-30)
diff --git a/plone/app/discussion/profiles/default/actions.xml b/plone/app/discussion/profiles/default/actions.xml
index d5da3ea..83c4f93 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">string:${globals_view/navigationRootUrl}/discussionitem_icon.gif</property>
+   <property name="icon_expr">string:${globals_view/navigationRootUrl}/discussionitem_icon.png</property>
    <property name="available_expr">portal/@@moderate-comments-enabled|nothing</property>
    <property name="permissions">
     <element value="Review comments"/>
diff --git a/plone/app/discussion/profiles/default/controlpanel.xml b/plone/app/discussion/profiles/default/controlpanel.xml
index 5e47af3..b0e5b17 100644
--- a/plone/app/discussion/profiles/default/controlpanel.xml
+++ b/plone/app/discussion/profiles/default/controlpanel.xml
@@ -11,7 +11,7 @@
         appId="plone.app.discussion"
         category="Plone"
         condition_expr=""
-        icon_expr="string:${portal_url}/discussionitem_icon.gif"
+        icon_expr="string:${portal_url}/discussionitem_icon.png"
         url_expr="string:${portal_url}/@@discussion-settings"
         visible="True"
         i18n:attributes="title">
diff --git a/plone/app/discussion/profiles/default/types/Discussion_Item.xml b/plone/app/discussion/profiles/default/types/Discussion_Item.xml
index f5feac0..e11e366 100644
--- a/plone/app/discussion/profiles/default/types/Discussion_Item.xml
+++ b/plone/app/discussion/profiles/default/types/Discussion_Item.xml
@@ -3,7 +3,7 @@
    i18n:domain="plone" xmlns:i18n="http://xml.zope.org/namespaces/i18n">
  <property name="title" i18n:translate="">Comment</property>
  <property name="description" i18n:translate="">Comments added to a content item.</property>
- <property name="content_icon">discussionitem_icon.gif</property>
+ <property name="content_icon">discussionitem_icon.png</property>
  <property name="content_meta_type">Discussion Item</property>
  <property name="product"></property>
  <property name="factory">plone.Comment</property>