diff --git a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp
index edc83c586..af3e575dd 100644
--- a/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp
+++ b/retroshare-gui/src/gui/feeds/GxsChannelGroupItem.cpp
@@ -176,13 +176,13 @@ void GxsChannelGroupItem::doExpand(bool open)
 	if (open)
 	{
 		ui->expandFrame->show();
-		ui->expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png")));
+		ui->expandButton->setIcon(QIcon(QString(":/icons/png/up-arrow.png")));
 		ui->expandButton->setToolTip(tr("Hide"));
 	}
 	else
 	{
 		ui->expandFrame->hide();
-		ui->expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
+		ui->expandButton->setIcon(QIcon(QString(":/icons/png/down-arrow.png")));
 		ui->expandButton->setToolTip(tr("Expand"));
 	}
 
diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
index bbf9e1823..c049dff59 100644
--- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
+++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.cpp
@@ -699,7 +699,7 @@ void GxsChannelPostItem::doExpand(bool open)
 	if (open)
 	{
 		ui->expandFrame->show();
-		ui->expandButton->setIcon(QIcon(QString(":/images/edit_remove24.png")));
+		ui->expandButton->setIcon(QIcon(QString(":/icons/png/up-arrow.png")));
 		ui->expandButton->setToolTip(tr("Hide"));
 
 		readToggled(false);
@@ -707,7 +707,7 @@ void GxsChannelPostItem::doExpand(bool open)
 	else
 	{
 		ui->expandFrame->hide();
-		ui->expandButton->setIcon(QIcon(QString(":/images/edit_add24.png")));
+		ui->expandButton->setIcon(QIcon(QString(":/icons/png/down-arrow.png")));
 		ui->expandButton->setToolTip(tr("Expand"));
 	}
 
diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
index 53e7f5348..e81b4ed78 100644
--- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
+++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
@@ -309,8 +309,8 @@
                <string>Download</string>
               </property>
               <property name="icon">
-               <iconset resource="../images.qrc">
-                <normaloff>:/images/download16.png</normaloff>:/images/download16.png</iconset>
+               <iconset resource="../icons.qrc">
+                <normaloff>:/icons/png/download.png</normaloff>:/icons/png/download.png</iconset>
               </property>
               <property name="autoExclusive">
                <bool>false</bool>
@@ -326,8 +326,8 @@
                <string>Play</string>
               </property>
               <property name="icon">
-               <iconset resource="../images.qrc">
-                <normaloff>:/images/player_play.png</normaloff>:/images/player_play.png</iconset>
+               <iconset resource="../icons.qrc">
+                <normaloff>:/icons/png/play.png</normaloff>:/icons/png/play.png</iconset>
               </property>
              </widget>
             </item>
@@ -336,6 +336,10 @@
               <property name="text">
                <string>Comments</string>
               </property>
+              <property name="icon">
+               <iconset resource="../icons.qrc">
+                <normaloff>:/icons/png/comment.png</normaloff>:/icons/png/comment.png</iconset>
+              </property>
              </widget>
             </item>
             <item>
@@ -373,8 +377,8 @@
                <string>Copy RetroShare Link</string>
               </property>
               <property name="icon">
-               <iconset resource="../images.qrc">
-                <normaloff>:/images/copyrslink.png</normaloff>:/images/copyrslink.png</iconset>
+               <iconset resource="../icons.qrc">
+                <normaloff>:/icons/png/copy.png</normaloff>:/icons/png/copy.png</iconset>
               </property>
              </widget>
             </item>
@@ -392,9 +396,8 @@
               <property name="toolTip">
                <string>Unsubscribe From Channel</string>
               </property>
-              <property name="icon">
-               <iconset resource="../images.qrc">
-                <normaloff>:/images/mail_delete.png</normaloff>:/images/mail_delete.png</iconset>
+              <property name="text">
+               <string>Unsubscribe</string>
               </property>
              </widget>
             </item>
@@ -413,8 +416,8 @@
                <string>Expand</string>
               </property>
               <property name="icon">
-               <iconset resource="../images.qrc">
-                <normaloff>:/images/edit_add24.png</normaloff>:/images/edit_add24.png</iconset>
+               <iconset resource="../icons.qrc">
+                <normaloff>:/icons/png/down-arrow.png</normaloff>:/icons/png/down-arrow.png</iconset>
               </property>
              </widget>
             </item>
@@ -433,8 +436,8 @@
                <string>Set as read and remove item</string>
               </property>
               <property name="icon">
-               <iconset resource="../images.qrc">
-                <normaloff>:/images/cancel.png</normaloff>:/images/cancel.png</iconset>
+               <iconset resource="../icons.qrc">
+                <normaloff>:/icons/png/correct.png</normaloff>:/icons/png/correct.png</iconset>
               </property>
              </widget>
             </item>
@@ -453,8 +456,8 @@
                <string>Remove Item</string>
               </property>
               <property name="icon">
-               <iconset resource="../images.qrc">
-                <normaloff>:/images/close_normal.png</normaloff>:/images/close_normal.png</iconset>
+               <iconset resource="../icons.qrc">
+                <normaloff>:/icons/svg/exit-red.svg</normaloff>:/icons/svg/exit-red.svg</iconset>
               </property>
              </widget>
             </item>
@@ -564,6 +567,7 @@
  </customwidgets>
  <resources>
   <include location="../images.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/feeds/SubFileItem.cpp b/retroshare-gui/src/gui/feeds/SubFileItem.cpp
index 0f542db21..ba81ab9bf 100644
--- a/retroshare-gui/src/gui/feeds/SubFileItem.cpp
+++ b/retroshare-gui/src/gui/feeds/SubFileItem.cpp
@@ -718,6 +718,7 @@ void SubFileItem::mediatype()
 	/* check if the file is not a media file and change text */
 	playButton->setText(tr("Open"));
 	playButton->setToolTip(tr("Open File"));
+	playButton->setIcon(QIcon());
 }
 
 void SubFileItem::copyLink()
diff --git a/retroshare-gui/src/gui/feeds/SubFileItem.ui b/retroshare-gui/src/gui/feeds/SubFileItem.ui
index d5c6b7181..6717836b5 100644
--- a/retroshare-gui/src/gui/feeds/SubFileItem.ui
+++ b/retroshare-gui/src/gui/feeds/SubFileItem.ui
@@ -83,8 +83,8 @@
            <string>Cancel Download</string>
           </property>
           <property name="icon">
-           <iconset resource="../images.qrc">
-            <normaloff>:/images/delete.png</normaloff>:/images/delete.png</iconset>
+           <iconset resource="../icons.qrc">
+            <normaloff>:/icons/png/cancel.png</normaloff>:/icons/png/cancel.png</iconset>
           </property>
          </widget>
         </item>
@@ -112,8 +112,8 @@
            <string>Download</string>
           </property>
           <property name="icon">
-           <iconset resource="../images.qrc">
-            <normaloff>:/images/download.png</normaloff>:/images/download.png</iconset>
+           <iconset resource="../icons.qrc">
+            <normaloff>:/icons/png/download.png</normaloff>:/icons/png/download.png</iconset>
           </property>
          </widget>
         </item>
@@ -141,8 +141,8 @@
            <string>Play</string>
           </property>
           <property name="icon">
-           <iconset resource="../images.qrc">
-            <normaloff>:/images/player_play.png</normaloff>:/images/player_play.png</iconset>
+           <iconset resource="../icons.qrc">
+            <normaloff>:/icons/png/play.png</normaloff>:/icons/png/play.png</iconset>
           </property>
          </widget>
         </item>
@@ -167,8 +167,8 @@
            <string>Copy RetroShare Link</string>
           </property>
           <property name="icon">
-           <iconset resource="../images.qrc">
-            <normaloff>:/images/copyrslink.png</normaloff>:/images/copyrslink.png</iconset>
+           <iconset resource="../icons.qrc">
+            <normaloff>:/icons/png/copy.png</normaloff>:/icons/png/copy.png</iconset>
           </property>
          </widget>
         </item>
@@ -242,6 +242,7 @@
  </widget>
  <resources>
   <include location="../images.qrc"/>
+  <include location="../icons.qrc"/>
  </resources>
  <connections/>
 </ui>
diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc
index d510544a8..3986bfad7 100644
--- a/retroshare-gui/src/gui/icons.qrc
+++ b/retroshare-gui/src/gui/icons.qrc
@@ -71,7 +71,7 @@
         <file>icons/png/add.png</file>
         <file>icons/png/attach-image.png</file>
         <file>icons/png/attach.png</file>
-		<file>icons/png/cert.png</file>
+        <file>icons/png/cert.png</file>
         <file>icons/png/channels-notify.png</file>
         <file>icons/png/channels.png</file>
         <file>icons/png/chat-bubble-notify.png</file>
@@ -261,5 +261,13 @@
         <file>icons/png/flame.png</file>
         <file>icons/png/new.png</file>
         <file>icons/png/top.png</file>
+        <file>icons/png/copy.png</file>
+        <file>icons/png/down-arrow.png</file>
+        <file>icons/png/download.png</file>
+        <file>icons/png/up-arrow.png</file>
+        <file>icons/png/play.png</file>
+        <file>icons/png/cancel.png</file>
+        <file>icons/png/correct.png</file>
+        <file>icons/png/comment.png</file>
     </qresource>
 </RCC>
diff --git a/retroshare-gui/src/gui/icons/png/cancel.png b/retroshare-gui/src/gui/icons/png/cancel.png
new file mode 100644
index 000000000..4755b642b
Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/cancel.png differ
diff --git a/retroshare-gui/src/gui/icons/png/comment.png b/retroshare-gui/src/gui/icons/png/comment.png
new file mode 100644
index 000000000..28d18c2b7
Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/comment.png differ
diff --git a/retroshare-gui/src/gui/icons/png/copy.png b/retroshare-gui/src/gui/icons/png/copy.png
new file mode 100644
index 000000000..b225ff4aa
Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/copy.png differ
diff --git a/retroshare-gui/src/gui/icons/png/correct.png b/retroshare-gui/src/gui/icons/png/correct.png
new file mode 100644
index 000000000..948c13987
Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/correct.png differ
diff --git a/retroshare-gui/src/gui/icons/png/down-arrow.png b/retroshare-gui/src/gui/icons/png/down-arrow.png
new file mode 100644
index 000000000..ac5d3a4c7
Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/down-arrow.png differ
diff --git a/retroshare-gui/src/gui/icons/png/download.png b/retroshare-gui/src/gui/icons/png/download.png
new file mode 100644
index 000000000..38414dfc9
Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/download.png differ
diff --git a/retroshare-gui/src/gui/icons/png/play.png b/retroshare-gui/src/gui/icons/png/play.png
new file mode 100644
index 000000000..3268aa2e6
Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/play.png differ
diff --git a/retroshare-gui/src/gui/icons/png/up-arrow.png b/retroshare-gui/src/gui/icons/png/up-arrow.png
new file mode 100644
index 000000000..34de4aba3
Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/up-arrow.png differ