diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.cpp b/retroshare-gui/src/gui/ChatLobbyWidget.cpp
index 884355d87..1c5201343 100644
--- a/retroshare-gui/src/gui/ChatLobbyWidget.cpp
+++ b/retroshare-gui/src/gui/ChatLobbyWidget.cpp
@@ -71,11 +71,12 @@
 #define IMAGE_CREATE          ""
 #define IMAGE_PUBLIC          ":/icons/png/chats.png"
 #define IMAGE_PRIVATE         ":/icons/png/chats-private.png"
+#define IMAGE_SIGNED          ":/icons/png/chats-signed.png"
 #define IMAGE_SUBSCRIBE       ":/icons/png/enter.png"  
 #define IMAGE_UNSUBSCRIBE     ":/icons/png/leave2.png"
 #define IMAGE_PEER_ENTERING   ":images/user/add_user24.png"
 #define IMAGE_PEER_LEAVING    ":images/user/remove_user24.png"
-#define IMAGE_TYPING		  ":images/typing.png" 
+#define IMAGE_TYPING          ":icons/png/typing.png" 
 #define IMAGE_MESSAGE	      ":images/chat.png" 
 #define IMAGE_AUTOSUBSCRIBE   ":images/accepted16.png"
 #define IMAGE_COPYRSLINK      ":/icons/png/copy.png"
diff --git a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
index 0e0b7b57c..3747fc5db 100644
--- a/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
+++ b/retroshare-gui/src/gui/feeds/GxsChannelPostItem.ui
@@ -347,6 +347,10 @@
               <property name="text">
                <string>Edit</string>
               </property>
+              <property name="icon">
+               <iconset resource="../icons.qrc">
+                <normaloff>:/icons/png/pencil-edit-button.png</normaloff>:/icons/png/pencil-edit-button.png</iconset>
+              </property>
              </widget>
             </item>
             <item>
diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc
index 99b277b2f..cdf09929b 100644
--- a/retroshare-gui/src/gui/icons.qrc
+++ b/retroshare-gui/src/gui/icons.qrc
@@ -67,6 +67,7 @@
         <file>icons/mail_red_128.png</file>
         <file>icons/newsfeed128.png</file>
         <file>icons/outlook.png</file>
+        <file>icons/question.png</file>
         <file>icons/plugins_128.png</file>
         <file>icons/png/add.png</file>
         <file>icons/png/attach-image.png</file>
@@ -115,6 +116,7 @@
         <file>icons/png/newsfeed-notify.png</file>
         <file>icons/png/newsfeed.png</file>
         <file>icons/png/options.png</file>
+		<file>icons/png/pencil-edit-button.png</file>
         <file>icons/png/people-notify.png</file>
         <file>icons/png/people.png</file>
         <file>icons/png/person.png</file>
@@ -132,6 +134,7 @@
         <file>icons/png/thumbs-down.png</file>
         <file>icons/png/thumbs-neutral.png</file>
         <file>icons/png/thumbs-up.png</file>
+		<file>icons/png/typing.png</file>
         <file>icons/png/video.png</file>
         <file>icons/posted_128.png</file>
         <file>icons/posted_red_128.png</file>
@@ -277,6 +280,7 @@
         <file>icons/png/comment.png</file>
         <file>icons/png/chats.png</file>
         <file>icons/png/chats-private.png</file>
+        <file>icons/png/chats-signed.png</file>
         <file>icons/png/fileshare.png</file>
         <file>icons/png/forum.png</file>
         <file>icons/png/message.png</file>
@@ -284,7 +288,6 @@
         <file>icons/png/postedlinks.png</file>
         <file>icons/png/people2.png</file>
         <file>icons/png/bandwidth.png</file>
-        <file>icons/png/netgraph2.png</file>
         <file>icons/png/options2.png</file>
         <file>icons/png/exit2.png</file>
     </qresource>
diff --git a/retroshare-gui/src/gui/icons/png/chats-private.png b/retroshare-gui/src/gui/icons/png/chats-private.png
index 039cc2b2d..72937c09f 100644
Binary files a/retroshare-gui/src/gui/icons/png/chats-private.png and b/retroshare-gui/src/gui/icons/png/chats-private.png differ
diff --git a/retroshare-gui/src/gui/icons/png/chats-signed.png b/retroshare-gui/src/gui/icons/png/chats-signed.png
new file mode 100644
index 000000000..039cc2b2d
Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/chats-signed.png differ
diff --git a/retroshare-gui/src/gui/icons/png/comment.png b/retroshare-gui/src/gui/icons/png/comment.png
index 28d18c2b7..5a99254ad 100644
Binary files a/retroshare-gui/src/gui/icons/png/comment.png and b/retroshare-gui/src/gui/icons/png/comment.png differ
diff --git a/retroshare-gui/src/gui/icons/png/pencil-edit-button.png b/retroshare-gui/src/gui/icons/png/pencil-edit-button.png
new file mode 100644
index 000000000..5a1f8dffe
Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/pencil-edit-button.png differ
diff --git a/retroshare-gui/src/gui/icons/png/typing.png b/retroshare-gui/src/gui/icons/png/typing.png
new file mode 100644
index 000000000..4f08a3807
Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/typing.png differ
diff --git a/retroshare-gui/src/gui/icons/question.png b/retroshare-gui/src/gui/icons/question.png
new file mode 100644
index 000000000..f850cfa89
Binary files /dev/null and b/retroshare-gui/src/gui/icons/question.png differ