diff --git a/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp b/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp
index d32e9cff5..aed93061c 100644
--- a/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp
+++ b/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp
@@ -165,10 +165,14 @@ void ChanMsgItem::toggle()
 	if (expandFrame->isHidden())
 	{
 		expandFrame->show();
+		expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png")));
+	  expandButton->setToolTip(tr("Hide"));
 	}
 	else
 	{
 		expandFrame->hide();
+    expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
+	  expandButton->setToolTip(tr("Expand"));
 	}
 }
 
diff --git a/retroshare-gui/src/gui/feeds/ChanMsgItem.ui b/retroshare-gui/src/gui/feeds/ChanMsgItem.ui
index a02bcfde0..538f05eca 100644
--- a/retroshare-gui/src/gui/feeds/ChanMsgItem.ui
+++ b/retroshare-gui/src/gui/feeds/ChanMsgItem.ui
@@ -152,7 +152,7 @@ p, li { white-space: pre-wrap; }
           </property>
           <property name="icon">
            <iconset resource="../images.qrc">
-            <normaloff>:/images/add_24x24.png</normaloff>:/images/add_24x24.png</iconset>
+            <normaloff>:/images/edit_add24.png</normaloff>:/images/edit_add24.png</iconset>
           </property>
          </widget>
         </item>
@@ -276,6 +276,7 @@ p, li { white-space: pre-wrap; }
   <include location="../images.qrc"/>
   <include location="../images.qrc"/>
   <include location="../images.qrc"/>
+  <include location="../images.qrc"/>
  </resources>
  <connections/>
 </ui>