diff --git a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp
index 8090dc353..9871190af 100644
--- a/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp
+++ b/retroshare-gui/src/gui/gxschannels/GxsChannelDialog.cpp
@@ -130,13 +130,13 @@ QString GxsChannelDialog::icon(IconType type)
 	case ICON_NEW:
 		return ":/icons/png/add.png";
 	case ICON_YOUR_GROUP:
-		return ":/images/folder16.png";
+		return ":/icons/png/channel.png";
 	case ICON_SUBSCRIBED_GROUP:
-		return ":/images/folder_red.png";
+		return ":/icons/png/channel-subscribed.png";
 	case ICON_POPULAR_GROUP:
-		return ":/images/folder_green.png";
+		return ":/icons/png/channel-popular.png";
 	case ICON_OTHER_GROUP:
-		return ":/images/folder_yellow.png";
+		return ":/icons/png/channel-other.png";
     case ICON_SEARCH:
         return ":/images/find.png";
 	case ICON_DEFAULT:
diff --git a/retroshare-gui/src/gui/icons.qrc b/retroshare-gui/src/gui/icons.qrc
index e3ee8a162..cfd2ff641 100644
--- a/retroshare-gui/src/gui/icons.qrc
+++ b/retroshare-gui/src/gui/icons.qrc
@@ -1,247 +1,251 @@
 <RCC>
-  <qresource prefix="/">
-    <file>icons/onion.png</file>
-    <file>icons/svg/hidden.svg</file>
-    <file>icons/svg/randomness.svg</file>
-    <file>icons/svg/password.svg</file>
-    <file>icons/stars/star0.png</file>
-    <file>icons/stars/star1.png</file>
-    <file>icons/stars/star2.png</file>
-    <file>icons/stars/star3.png</file>
-    <file>icons/stars/star4.png</file>
-    <file>icons/stars/star5.png</file>
-    <file>icons/add_user_256.png</file>
-    <file>icons/anonymous_blue_128.png</file>
-    <file>icons/anonymous_green_128.png</file>
-    <file>icons/aol.png</file>
-    <file>icons/transport128.png</file>
-    <file>icons/bandwidth128.png</file>
-    <file>icons/RTT128.png</file>
-    <file>icons/DHT128.png</file>
-    <file>icons/turtle128.png</file>
-    <file>icons/GRouter128.png</file>
-    <file>icons/avatar_128.png</file>
-    <file>icons/avatar_grey_128.png</file>
-    <file>icons/biohazard_red.png</file>
-    <file>icons/biohazard_yellow.png</file>
-    <file>icons/blank_blue_128.png</file>
-    <file>icons/blank_green_128.png</file>
-    <file>icons/blank_red_128.png</file>
-    <file>icons/browsable_blue_128.png</file>
-    <file>icons/browsable_green_128.png</file>
-    <file>icons/bullet_blue_128.png</file>
-    <file>icons/bullet_green_128.png</file>
-    <file>icons/bullet_green_yellow_star_128.png</file>
-    <file>icons/bullet_grey_128.png</file>
-    <file>icons/bullet_red_128.png</file>
-    <file>icons/bullet_yellow_128.png</file>
-    <file>icons/channels_128.png</file>
-    <file>icons/channels_red_128.png</file>
-    <file>icons/chat_128.png</file>
-    <file>icons/chat_red_128.png</file>
-    <file>icons/circles_128.png</file>
-    <file>icons/circles_new_128.png</file>
-    <file>icons/flag-green.png</file>
-    <file>icons/friends_128.png</file>
-    <file>icons/global_switch_off_128.png</file>
-    <file>icons/global_switch_on_128.png</file>
-    <file>icons/gmail.png</file>
-    <file>icons/help_128.png</file>
-    <file>icons/help_64.png</file>
-    <file>icons/information_128.png</file>
-    <file>icons/internet_128.png</file>
-    <file>icons/invite64.png</file>
-    <file>icons/knews_128.png</file>
-    <file>icons/knews_red_128.png</file>
-    <file>icons/konversation_128.png</file>
-    <file>icons/konversation128.png</file>
-    <file>icons/konversation_red_128.png</file>
-    <file>icons/ktorrent_128.png</file>
-    <file>icons/ktorrent_red_128.png</file>
-    <file>icons/logo_0_connected_128.png</file>
-    <file>icons/logo_128.png</file>
-    <file>icons/logo_1_connected_128.png</file>
-    <file>icons/logo_2_connected_128.png</file>
-    <file>icons/mail_128.png</file>
-    <file>icons/mail_old_128.png</file>
-    <file>icons/mail_red_128.png</file>
-    <file>icons/newsfeed128.png</file>
-    <file>icons/outlook.png</file>
-    <file>icons/plugins_128.png</file>
-    <file>icons/png/add.png</file>
-    <file>icons/png/attach-image.png</file>
-    <file>icons/png/attach.png</file>
-    <file>icons/png/channels-notify.png</file>
-    <file>icons/png/channels.png</file>
-    <file>icons/png/chat-bubble-notify.png</file>
-    <file>icons/png/chat-bubble.png</file>
-    <file>icons/png/chat-lobbies-notify.png</file>
-    <file>icons/png/chat-lobbies.png</file>
-    <file>icons/png/circles.png</file>
-    <file>icons/png/empty-circle.png</file>
-    <file>icons/png/exit.png</file>
-    <file>icons/png/feedreader-notify.png</file>
-    <file>icons/png/feedreader.png</file>
-    <file>icons/png/filesharing-notify.png</file>
-    <file>icons/png/filesharing.png</file>
-    <file>icons/png/font.png</file>
-    <file>icons/png/forums-notify.png</file>
-    <file>icons/png/forums.png</file>
-    <file>icons/png/fullscreen_arrows.png</file>
-    <file>icons/png/highlight.png</file>
-	<file>icons/png/home.png</file>
-    <file>icons/png/info.png</file>
-    <file>icons/png/invite.png</file>
-    <file>icons/png/keyring.png</file>
-    <file>icons/png/leave.png</file>
-    <file>icons/png/messages-notify.png</file>
-    <file>icons/png/messages.png</file>
-    <file>icons/png/microphone_mute.png</file>
-    <file>icons/png/microphone.png</file>
-    <file>icons/png/netgraph.png</file>
-    <file>icons/png/network-notify.png</file>
-    <file>icons/png/network.png</file>
-    <file>icons/png/network-puplic.png</file>
-    <file>icons/png/newsfeed-notify.png</file>
-    <file>icons/png/newsfeed.png</file>
-    <file>icons/png/options.png</file>
-    <file>icons/png/people-notify.png</file>
-    <file>icons/png/people.png</file>
-    <file>icons/png/person.png</file>
-    <file>icons/png/phone_hangup.png</file>
-    <file>icons/png/phone.png</file>
-    <file>icons/png/posted-notify.png</file>
-    <file>icons/png/posted.png</file>
-    <file>icons/png/search.png</file>
-    <file>icons/png/send-message-blocked.png</file>
-    <file>icons/png/send-message.png</file>
-    <file>icons/png/settings.png</file>
-    <file>icons/png/smiley.png</file>
-    <file>icons/png/speaker_mute.png</file>
-    <file>icons/png/speaker.png</file>
-    <file>icons/png/thumbs-down.png</file>
-    <file>icons/png/thumbs-neutral.png</file>
-    <file>icons/png/thumbs-up.png</file>
-    <file>icons/png/video.png</file>
-    <file>icons/posted_128.png</file>
-    <file>icons/posted_red_128.png</file>
-    <file>icons/quit_128.png</file>
-    <file>icons/search_red_128.png</file>
-    <file>icons/security_high_128.png</file>
-    <file>icons/security_low_128.png</file>
-    <file>icons/security_medium_128.png</file>
-    <file>icons/settings/appearance.svg</file>
-    <file>icons/settings/channels.svg</file>
-    <file>icons/settings/chat.svg</file>
-    <file>icons/settings/directories.svg</file>
-    <file>icons/settings/filesharing.svg</file>
-    <file>icons/settings/forums.svg</file>
-    <file>icons/settings/general.svg</file>
-    <file>icons/settings/messages.svg</file>
-    <file>icons/settings/network.svg</file>
-    <file>icons/settings/notify.svg</file>
-    <file>icons/settings/people.svg</file>
-    <file>icons/settings/permissions.svg</file>
-    <file>icons/settings/plugins.svg</file>
-    <file>icons/settings/posted.svg</file>
-    <file>icons/settings/profile.svg</file>
-    <file>icons/settings/server.svg</file>
-    <file>icons/settings/sound.svg</file>
-    <file>icons/settings/webinterface.svg</file>
-    <file>icons/star_overlay_128.png</file>
-    <file>icons/svg/add.svg</file>
-    <file>icons/svg/attach-image.svg</file>
-    <file>icons/svg/attach.svg</file>
-    <file>icons/svg/channels-notify.svg</file>
-    <file>icons/svg/channels.svg</file>
-    <file>icons/svg/chat-bubble-notify.svg</file>
-    <file>icons/svg/chat-bubble.svg</file>
-    <file>icons/svg/chat-lobbies-notify.svg</file>
-    <file>icons/svg/chat-lobbies.svg</file>
-    <file>icons/svg/circles.svg</file>
-    <file>icons/svg/download.svg</file>
-    <file>icons/svg/empty-circle.svg</file>
-    <file>icons/svg/exit-red.svg</file>
-    <file>icons/svg/exit.svg</file>
-    <file>icons/svg/feedreader-notify.svg</file>
-    <file>icons/svg/feedreader.svg</file>
-    <file>icons/svg/filesharing-notify.svg</file>
-    <file>icons/svg/filesharing.svg</file>
-    <file>icons/svg/folders1.svg</file>
-    <file>icons/svg/folders.svg</file>
-    <file>icons/svg/font.svg</file>
-    <file>icons/svg/forums-notify.svg</file>
-    <file>icons/svg/forums.svg</file>
-    <file>icons/svg/fullscreen_arrows.svg</file>
-    <file>icons/svg/highlight.svg</file>
-    <file>icons/svg/info.svg</file>
-    <file>icons/svg/invite.svg</file>
-    <file>icons/svg/keyring.svg</file>
-    <file>icons/svg/leave.svg</file>
-    <file>icons/svg/magnifying-glass.svg</file>
-    <file>icons/svg/messages-notify.svg</file>
-    <file>icons/svg/messages.svg</file>
-    <file>icons/svg/microphone_mute.svg</file>
-    <file>icons/svg/microphone.svg</file>
-    <file>icons/svg/netgraph.svg</file>
-    <file>icons/svg/network-notify.svg</file>
-    <file>icons/svg/network-puplic.svg</file>
-    <file>icons/svg/network.svg</file>
-    <file>icons/svg/newsfeed-notify.svg</file>
-    <file>icons/svg/newsfeed.svg</file>
-    <file>icons/svg/options.svg</file>
-    <file>icons/svg/paste.svg</file>
-    <file>icons/svg/people-notify.svg</file>
-    <file>icons/svg/people.svg</file>
-    <file>icons/svg/person.svg</file>
-    <file>icons/svg/phone_hangup.svg</file>
-    <file>icons/svg/phone.svg</file>
-    <file>icons/svg/posted-notify.svg</file>
-    <file>icons/svg/posted.svg</file>
-    <file>icons/svg/profile.svg</file>
-    <file>icons/svg/retroshare-info.svg</file>
-    <file>icons/svg/retroshare-splash.svg</file>
-    <file>icons/svg/retroshare-symbol_black_bg.svg</file>
-    <file>icons/svg/retroshare-symbol_gradients.svg</file>
-    <file>icons/svg/retroshare-symbol-minimal.svg</file>
-    <file>icons/svg/search.svg</file>
-    <file>icons/svg/send-message-blocked.svg</file>
-    <file>icons/svg/send-message.svg</file>
-    <file>icons/svg/settings.svg</file>
-    <file>icons/svg/share.svg</file>
-    <file>icons/svg/smiley.svg</file>
-    <file>icons/svg/speaker_mute.svg</file>
-    <file>icons/svg/speaker.svg</file>
-    <file>icons/svg/thumbs-down.svg</file>
-    <file>icons/svg/thumbs-neutral.svg</file>
-    <file>icons/svg/thumbs-up.svg</file>
-    <file>icons/svg/upload.svg</file>
-    <file>icons/svg/video.svg</file>
-    <file>icons/switch00_128.png</file>
-    <file>icons/switch01_128.png</file>
-    <file>icons/switch10_128.png</file>
-    <file>icons/switch11_128.png</file>
-    <file>icons/system_128.png</file>
-    <file>icons/tile_checking_48.png</file>
-    <file>icons/tile_downloaded_48.png</file>
-    <file>icons/tile_downloading_48.png</file>
-    <file>icons/tile_inactive_48.png</file>
-    <file>icons/tor-logo.png</file>
-    <file>icons/tor-off.png</file>
-    <file>icons/tor-on.png</file>
-    <file>icons/no-tor.png</file>
-    <file>icons/tor-starting.png</file>
-    <file>icons/tor-stopping.png</file>
-    <file>icons/user-away_64.png</file>
-    <file>icons/user-away-extended_64.png</file>
-    <file>icons/user-busy_64.png</file>
-    <file>icons/user-offline_64.png</file>
-    <file>icons/user-online_64.png</file>
-    <file>icons/void_128.png</file>
-    <file>icons/warning_red_128.png</file>
-    <file>icons/warning_yellow_128.png</file>
-    <file>icons/yahoo.png</file>
-    <file>icons/yandex.png</file>
-    <file>icons/png/markdown-mark.png</file>
-  </qresource>
+    <qresource prefix="/">
+        <file>icons/onion.png</file>
+        <file>icons/svg/hidden.svg</file>
+        <file>icons/svg/randomness.svg</file>
+        <file>icons/svg/password.svg</file>
+        <file>icons/stars/star0.png</file>
+        <file>icons/stars/star1.png</file>
+        <file>icons/stars/star2.png</file>
+        <file>icons/stars/star3.png</file>
+        <file>icons/stars/star4.png</file>
+        <file>icons/stars/star5.png</file>
+        <file>icons/add_user_256.png</file>
+        <file>icons/anonymous_blue_128.png</file>
+        <file>icons/anonymous_green_128.png</file>
+        <file>icons/aol.png</file>
+        <file>icons/transport128.png</file>
+        <file>icons/bandwidth128.png</file>
+        <file>icons/RTT128.png</file>
+        <file>icons/DHT128.png</file>
+        <file>icons/turtle128.png</file>
+        <file>icons/GRouter128.png</file>
+        <file>icons/avatar_128.png</file>
+        <file>icons/avatar_grey_128.png</file>
+        <file>icons/biohazard_red.png</file>
+        <file>icons/biohazard_yellow.png</file>
+        <file>icons/blank_blue_128.png</file>
+        <file>icons/blank_green_128.png</file>
+        <file>icons/blank_red_128.png</file>
+        <file>icons/browsable_blue_128.png</file>
+        <file>icons/browsable_green_128.png</file>
+        <file>icons/bullet_blue_128.png</file>
+        <file>icons/bullet_green_128.png</file>
+        <file>icons/bullet_green_yellow_star_128.png</file>
+        <file>icons/bullet_grey_128.png</file>
+        <file>icons/bullet_red_128.png</file>
+        <file>icons/bullet_yellow_128.png</file>
+        <file>icons/channels_128.png</file>
+        <file>icons/channels_red_128.png</file>
+        <file>icons/chat_128.png</file>
+        <file>icons/chat_red_128.png</file>
+        <file>icons/circles_128.png</file>
+        <file>icons/circles_new_128.png</file>
+        <file>icons/flag-green.png</file>
+        <file>icons/friends_128.png</file>
+        <file>icons/global_switch_off_128.png</file>
+        <file>icons/global_switch_on_128.png</file>
+        <file>icons/gmail.png</file>
+        <file>icons/help_128.png</file>
+        <file>icons/help_64.png</file>
+        <file>icons/information_128.png</file>
+        <file>icons/internet_128.png</file>
+        <file>icons/invite64.png</file>
+        <file>icons/knews_128.png</file>
+        <file>icons/knews_red_128.png</file>
+        <file>icons/konversation_128.png</file>
+        <file>icons/konversation128.png</file>
+        <file>icons/konversation_red_128.png</file>
+        <file>icons/ktorrent_128.png</file>
+        <file>icons/ktorrent_red_128.png</file>
+        <file>icons/logo_0_connected_128.png</file>
+        <file>icons/logo_128.png</file>
+        <file>icons/logo_1_connected_128.png</file>
+        <file>icons/logo_2_connected_128.png</file>
+        <file>icons/mail_128.png</file>
+        <file>icons/mail_old_128.png</file>
+        <file>icons/mail_red_128.png</file>
+        <file>icons/newsfeed128.png</file>
+        <file>icons/outlook.png</file>
+        <file>icons/plugins_128.png</file>
+        <file>icons/png/add.png</file>
+        <file>icons/png/attach-image.png</file>
+        <file>icons/png/attach.png</file>
+        <file>icons/png/channels-notify.png</file>
+        <file>icons/png/channels.png</file>
+        <file>icons/png/chat-bubble-notify.png</file>
+        <file>icons/png/chat-bubble.png</file>
+        <file>icons/png/chat-lobbies-notify.png</file>
+        <file>icons/png/chat-lobbies.png</file>
+        <file>icons/png/circles.png</file>
+        <file>icons/png/empty-circle.png</file>
+        <file>icons/png/exit.png</file>
+        <file>icons/png/feedreader-notify.png</file>
+        <file>icons/png/feedreader.png</file>
+        <file>icons/png/filesharing-notify.png</file>
+        <file>icons/png/filesharing.png</file>
+        <file>icons/png/font.png</file>
+        <file>icons/png/forums-notify.png</file>
+        <file>icons/png/forums.png</file>
+        <file>icons/png/fullscreen_arrows.png</file>
+        <file>icons/png/highlight.png</file>
+        <file>icons/png/home.png</file>
+        <file>icons/png/info.png</file>
+        <file>icons/png/invite.png</file>
+        <file>icons/png/keyring.png</file>
+        <file>icons/png/leave.png</file>
+        <file>icons/png/messages-notify.png</file>
+        <file>icons/png/messages.png</file>
+        <file>icons/png/microphone_mute.png</file>
+        <file>icons/png/microphone.png</file>
+        <file>icons/png/netgraph.png</file>
+        <file>icons/png/network-notify.png</file>
+        <file>icons/png/network.png</file>
+        <file>icons/png/network-puplic.png</file>
+        <file>icons/png/newsfeed-notify.png</file>
+        <file>icons/png/newsfeed.png</file>
+        <file>icons/png/options.png</file>
+        <file>icons/png/people-notify.png</file>
+        <file>icons/png/people.png</file>
+        <file>icons/png/person.png</file>
+        <file>icons/png/phone_hangup.png</file>
+        <file>icons/png/phone.png</file>
+        <file>icons/png/posted-notify.png</file>
+        <file>icons/png/posted.png</file>
+        <file>icons/png/search.png</file>
+        <file>icons/png/send-message-blocked.png</file>
+        <file>icons/png/send-message.png</file>
+        <file>icons/png/settings.png</file>
+        <file>icons/png/smiley.png</file>
+        <file>icons/png/speaker_mute.png</file>
+        <file>icons/png/speaker.png</file>
+        <file>icons/png/thumbs-down.png</file>
+        <file>icons/png/thumbs-neutral.png</file>
+        <file>icons/png/thumbs-up.png</file>
+        <file>icons/png/video.png</file>
+        <file>icons/posted_128.png</file>
+        <file>icons/posted_red_128.png</file>
+        <file>icons/quit_128.png</file>
+        <file>icons/search_red_128.png</file>
+        <file>icons/security_high_128.png</file>
+        <file>icons/security_low_128.png</file>
+        <file>icons/security_medium_128.png</file>
+        <file>icons/settings/appearance.svg</file>
+        <file>icons/settings/channels.svg</file>
+        <file>icons/settings/chat.svg</file>
+        <file>icons/settings/directories.svg</file>
+        <file>icons/settings/filesharing.svg</file>
+        <file>icons/settings/forums.svg</file>
+        <file>icons/settings/general.svg</file>
+        <file>icons/settings/messages.svg</file>
+        <file>icons/settings/network.svg</file>
+        <file>icons/settings/notify.svg</file>
+        <file>icons/settings/people.svg</file>
+        <file>icons/settings/permissions.svg</file>
+        <file>icons/settings/plugins.svg</file>
+        <file>icons/settings/posted.svg</file>
+        <file>icons/settings/profile.svg</file>
+        <file>icons/settings/server.svg</file>
+        <file>icons/settings/sound.svg</file>
+        <file>icons/settings/webinterface.svg</file>
+        <file>icons/star_overlay_128.png</file>
+        <file>icons/svg/add.svg</file>
+        <file>icons/svg/attach-image.svg</file>
+        <file>icons/svg/attach.svg</file>
+        <file>icons/svg/channels-notify.svg</file>
+        <file>icons/svg/channels.svg</file>
+        <file>icons/svg/chat-bubble-notify.svg</file>
+        <file>icons/svg/chat-bubble.svg</file>
+        <file>icons/svg/chat-lobbies-notify.svg</file>
+        <file>icons/svg/chat-lobbies.svg</file>
+        <file>icons/svg/circles.svg</file>
+        <file>icons/svg/download.svg</file>
+        <file>icons/svg/empty-circle.svg</file>
+        <file>icons/svg/exit-red.svg</file>
+        <file>icons/svg/exit.svg</file>
+        <file>icons/svg/feedreader-notify.svg</file>
+        <file>icons/svg/feedreader.svg</file>
+        <file>icons/svg/filesharing-notify.svg</file>
+        <file>icons/svg/filesharing.svg</file>
+        <file>icons/svg/folders1.svg</file>
+        <file>icons/svg/folders.svg</file>
+        <file>icons/svg/font.svg</file>
+        <file>icons/svg/forums-notify.svg</file>
+        <file>icons/svg/forums.svg</file>
+        <file>icons/svg/fullscreen_arrows.svg</file>
+        <file>icons/svg/highlight.svg</file>
+        <file>icons/svg/info.svg</file>
+        <file>icons/svg/invite.svg</file>
+        <file>icons/svg/keyring.svg</file>
+        <file>icons/svg/leave.svg</file>
+        <file>icons/svg/magnifying-glass.svg</file>
+        <file>icons/svg/messages-notify.svg</file>
+        <file>icons/svg/messages.svg</file>
+        <file>icons/svg/microphone_mute.svg</file>
+        <file>icons/svg/microphone.svg</file>
+        <file>icons/svg/netgraph.svg</file>
+        <file>icons/svg/network-notify.svg</file>
+        <file>icons/svg/network-puplic.svg</file>
+        <file>icons/svg/network.svg</file>
+        <file>icons/svg/newsfeed-notify.svg</file>
+        <file>icons/svg/newsfeed.svg</file>
+        <file>icons/svg/options.svg</file>
+        <file>icons/svg/paste.svg</file>
+        <file>icons/svg/people-notify.svg</file>
+        <file>icons/svg/people.svg</file>
+        <file>icons/svg/person.svg</file>
+        <file>icons/svg/phone_hangup.svg</file>
+        <file>icons/svg/phone.svg</file>
+        <file>icons/svg/posted-notify.svg</file>
+        <file>icons/svg/posted.svg</file>
+        <file>icons/svg/profile.svg</file>
+        <file>icons/svg/retroshare-info.svg</file>
+        <file>icons/svg/retroshare-splash.svg</file>
+        <file>icons/svg/retroshare-symbol_black_bg.svg</file>
+        <file>icons/svg/retroshare-symbol_gradients.svg</file>
+        <file>icons/svg/retroshare-symbol-minimal.svg</file>
+        <file>icons/svg/search.svg</file>
+        <file>icons/svg/send-message-blocked.svg</file>
+        <file>icons/svg/send-message.svg</file>
+        <file>icons/svg/settings.svg</file>
+        <file>icons/svg/share.svg</file>
+        <file>icons/svg/smiley.svg</file>
+        <file>icons/svg/speaker_mute.svg</file>
+        <file>icons/svg/speaker.svg</file>
+        <file>icons/svg/thumbs-down.svg</file>
+        <file>icons/svg/thumbs-neutral.svg</file>
+        <file>icons/svg/thumbs-up.svg</file>
+        <file>icons/svg/upload.svg</file>
+        <file>icons/svg/video.svg</file>
+        <file>icons/switch00_128.png</file>
+        <file>icons/switch01_128.png</file>
+        <file>icons/switch10_128.png</file>
+        <file>icons/switch11_128.png</file>
+        <file>icons/system_128.png</file>
+        <file>icons/tile_checking_48.png</file>
+        <file>icons/tile_downloaded_48.png</file>
+        <file>icons/tile_downloading_48.png</file>
+        <file>icons/tile_inactive_48.png</file>
+        <file>icons/tor-logo.png</file>
+        <file>icons/tor-off.png</file>
+        <file>icons/tor-on.png</file>
+        <file>icons/no-tor.png</file>
+        <file>icons/tor-starting.png</file>
+        <file>icons/tor-stopping.png</file>
+        <file>icons/user-away_64.png</file>
+        <file>icons/user-away-extended_64.png</file>
+        <file>icons/user-busy_64.png</file>
+        <file>icons/user-offline_64.png</file>
+        <file>icons/user-online_64.png</file>
+        <file>icons/void_128.png</file>
+        <file>icons/warning_red_128.png</file>
+        <file>icons/warning_yellow_128.png</file>
+        <file>icons/yahoo.png</file>
+        <file>icons/yandex.png</file>
+        <file>icons/png/markdown-mark.png</file>
+        <file>icons/png/channel.png</file>
+        <file>icons/png/channel-other.png</file>
+        <file>icons/png/channel-popular.png</file>
+        <file>icons/png/channel-subscribed.png</file>
+    </qresource>
 </RCC>
diff --git a/retroshare-gui/src/gui/icons/png/channel-other.png b/retroshare-gui/src/gui/icons/png/channel-other.png
new file mode 100644
index 000000000..1b16936d9
Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/channel-other.png differ
diff --git a/retroshare-gui/src/gui/icons/png/channel-popular.png b/retroshare-gui/src/gui/icons/png/channel-popular.png
new file mode 100644
index 000000000..0c748dfe0
Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/channel-popular.png differ
diff --git a/retroshare-gui/src/gui/icons/png/channel-subscribed.png b/retroshare-gui/src/gui/icons/png/channel-subscribed.png
new file mode 100644
index 000000000..d06f88200
Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/channel-subscribed.png differ
diff --git a/retroshare-gui/src/gui/icons/png/channel.png b/retroshare-gui/src/gui/icons/png/channel.png
new file mode 100644
index 000000000..c3ec9f119
Binary files /dev/null and b/retroshare-gui/src/gui/icons/png/channel.png differ
diff --git a/retroshare-gui/src/gui/icons/svg/attach.svg b/retroshare-gui/src/gui/icons/svg/attach.svg
index 3725cf017..38430bdff 100644
--- a/retroshare-gui/src/gui/icons/svg/attach.svg
+++ b/retroshare-gui/src/gui/icons/svg/attach.svg
@@ -7,18 +7,17 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   height="80"
-   style="enable-background:new 0 0 110 110;"
+   height="128"
    version="1.0"
-   viewBox="0 0 110 110"
-   width="80"
+   viewBox="0 0 176 176"
+   width="128"
    xml:space="preserve"
    id="svg2"
-   inkscape:version="0.91 r13725"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
    sodipodi:docname="attach.svg"><metadata
      id="metadata20"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
      id="defs18" /><sodipodi:namedview
      pagecolor="#ffffff"
      bordercolor="#666666"
@@ -28,34 +27,36 @@
      guidetolerance="10"
      inkscape:pageopacity="0"
      inkscape:pageshadow="2"
-     inkscape:window-width="1920"
-     inkscape:window-height="1009"
+     inkscape:window-width="1024"
+     inkscape:window-height="705"
      id="namedview16"
      showgrid="false"
      inkscape:zoom="3.0341309"
-     inkscape:cx="-75.947202"
-     inkscape:cy="16.755676"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
+     inkscape:cx="76.713743"
+     inkscape:cy="56.305717"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
      inkscape:window-maximized="1"
      inkscape:current-layer="layer1" /><g
-     id="Artboard" /><g
+     id="Artboard"
+     transform="translate(0,66)" /><g
      inkscape:groupmode="layer"
      id="layer1"
      inkscape:label="Layer 1"
-     style="display:inline"><circle
+     style="display:inline"
+     transform="translate(0,66)"><circle
        id="circle6"
-       style="fill:#039bd5;fill-opacity:1"
-       r="55"
-       cy="55"
-       cx="55" /><path
-       style="fill:#000000;fill-opacity:0.15686275"
+       style="fill:#039bd5;fill-opacity:1;stroke-width:1.60000002"
+       cy="22"
+       cx="88"
+       r="88" /><path
+       style="fill:#000000;fill-opacity:0.15686275;stroke-width:1.60000002"
        sodipodi:nodetypes="ccccccccccsasccsccccccccccccccsasccccccccccc"
        id="use4188"
-       d="m 32.658016,88.493222 c -3.615848,8.28e-4 -7.263315,-1.424329 -10.041357,-4.202659 -2.77944,-2.779018 -4.205861,-6.427875 -4.204884,-10.04303 -0.0049,-3.403438 1.278081,-6.83375 3.862101,-9.413455 l 0.593216,-0.593494 35.641173,-35.642841 c 3.391596,-3.396336 7.894417,-5.081409 12.383162,-5.075283 4.771078,-0.002 9.594249,1.87938 13.276261,5.560136 3.678385,3.680194 5.559013,8.500861 5.558044,13.271665 0.0042,4.490277 -1.679643,8.991979 -5.075281,12.385393 -10.716723,10.715527 -20.64003,20.648354 -29.983159,29.721144 -1.137853,1.104931 -3.354856,1.236196 -4.391767,0.200648 -1.067827,-1.066425 -1.137299,-3.218296 0.200684,-4.522981 9.420341,-9.185906 29.722264,-29.852779 29.722264,-29.852779 2.153348,-2.157945 3.224312,-4.981261 3.229331,-7.9316 -4.97e-4,-3.126264 -1.22794,-6.331216 -3.714323,-8.818435 -2.48722,-2.488056 -5.693845,-3.714325 -8.821914,-3.716554 -2.949092,0.0058 -5.771848,1.076122 -7.928541,3.230447 L 27.31921,68.693496 26.726551,69.286573 c -1.343545,1.346615 -2.011143,3.098819 -2.016991,4.960511 0.002,1.972136 0.773588,4.003619 2.360607,5.591332 1.585346,1.583812 3.615429,2.354624 5.587991,2.356842 1.861408,-0.0058 3.613479,-0.673018 4.961066,-2.016569 L 62.839621,54.959584 64.95174,52.847599 c 0.506025,-0.509784 0.757852,-1.157881 0.76273,-1.899994 0,-0.782361 -0.304758,-1.604703 -0.959542,-2.259626 -0.656167,-0.656451 -1.478649,-0.960092 -2.260316,-0.962322 -0.741838,0.0064 -1.388963,0.258657 -1.899442,0.765517 0,0 -17.740223,17.818894 -20.832589,21.018568 -1.223513,1.265969 -3.596261,1.141861 -4.639005,3e-6 -1.036591,-1.135117 -0.92155,-3.247964 0.417589,-4.592681 3.215314,-3.228707 20.59883,-20.877036 20.59883,-20.877036 1.744968,-1.750676 4.072705,-2.616475 6.354335,-2.610904 2.425928,-0.002 4.864259,0.956613 6.715226,2.80674 1.845669,1.848595 2.803537,4.284834 2.803537,6.711885 0.0049,2.28024 -0.859952,4.607559 -2.608679,6.353359 l -2.112816,2.111986 -25.22026,25.220118 c -2.576358,2.578305 -5.997345,3.860847 -9.393545,3.860151 l -0.01975,-1.41e-4 0,0 z"
+       d="m 52.252826,75.589155 c -5.785357,0.0013 -11.621304,-2.278926 -16.066172,-6.724254 -4.447104,-4.446429 -6.729377,-10.2846 -6.727814,-16.068848 -0.0078,-5.445501 2.04493,-10.934 6.179362,-15.061528 l 0.949145,-0.949591 57.025877,-57.028545 c 5.426554,-5.434138 12.631066,-8.130255 19.813056,-8.120453 7.63373,-0.0032 15.3508,3.007008 21.24202,8.896218 5.88542,5.88831 8.89442,13.6013772 8.89287,21.2346636 0.007,7.1844432 -2.68743,14.3871664 -8.12045,19.8166284 -17.14676,17.144844 -33.02405,33.037367 -47.973053,47.553831 -1.820565,1.767889 -5.367769,1.977913 -7.026827,0.321037 -1.708523,-1.70628 -1.819678,-5.149274 0.321094,-7.23677 15.072546,-14.69745 47.555626,-47.764446 47.555626,-47.764446 3.44535,-3.452712 5.1589,-7.970018 5.16693,-12.6905604 -8e-4,-5.0020224 -1.96471,-10.1299456 -5.94292,-14.1094956 -3.97955,-3.98089 -9.11015,-5.94292 -14.11506,-5.946487 -4.71855,0.0093 -9.23496,1.721795 -12.68567,5.168715 l -57.030104,57.030324 -0.948254,0.948923 c -2.149672,2.154584 -3.217829,4.95811 -3.227186,7.936817 0.0032,3.155418 1.237741,6.405791 3.776971,8.946132 2.536554,2.534099 5.784687,3.767398 8.940786,3.770947 2.978253,-0.0093 5.781566,-1.076829 7.937705,-3.226511 l 40.352632,-40.350568 3.37939,-3.379176 c 0.80964,-0.815654 1.21257,-1.852609 1.22037,-3.03999 0,-1.251778 -0.48761,-2.567525 -1.53527,-3.615402 -1.04986,-1.050321 -2.36583,-1.536147 -3.616501,-1.539715 -1.186941,0.01024 -2.222341,0.413851 -3.039107,1.224827 0,0 -28.384357,28.510231 -33.332142,33.629709 -1.957621,2.025551 -5.754018,1.826978 -7.422408,5e-6 -1.658546,-1.816187 -1.47448,-5.196742 0.668142,-7.34829 5.144502,-5.165931 32.958128,-33.4032572 32.958128,-33.4032572 2.791949,-2.8010816 6.516328,-4.18636 10.166936,-4.1774464 3.881482,-0.0032 7.782812,1.5305808 10.744362,4.490784 2.95307,2.957752 4.48566,6.8557346 4.48566,10.7390156 0.008,3.648384 -1.37592,7.372095 -4.17389,10.165375 l -3.3805,3.379177 -40.352419,40.352189 c -4.122173,4.125288 -9.595752,6.177355 -15.029672,6.176242 l -0.0316,-2.26e-4 v 0 z"
        inkscape:connector-curvature="0" /><path
        inkscape:connector-curvature="0"
-       d="m 32.658016,86.241133 c -3.615848,8.27e-4 -7.263315,-1.424329 -10.041357,-4.202659 -2.77944,-2.779019 -4.205861,-6.427875 -4.204884,-10.043031 -0.0049,-3.403437 1.278081,-6.83375 3.862101,-9.413456 l 0.593216,-0.593494 35.641173,-35.642841 c 3.391596,-3.396336 7.894417,-5.081408 12.383162,-5.075281 4.771078,-0.002 9.594249,1.879379 13.276261,5.560134 3.678385,3.680195 5.559013,8.500863 5.558044,13.271665 0.0042,4.490278 -1.679643,8.991981 -5.075281,12.385394 -10.716723,10.715526 -20.64003,20.648355 -29.983159,29.721144 -1.137853,1.10493 -3.354856,1.236196 -4.391767,0.200647 -1.067827,-1.066424 -1.137299,-3.218295 0.200684,-4.522981 9.420341,-9.185904 29.722264,-29.852778 29.722264,-29.852778 2.153348,-2.157945 3.224312,-4.981262 3.229331,-7.9316 -4.97e-4,-3.126264 -1.22794,-6.331217 -3.714323,-8.818435 -2.48722,-2.488056 -5.693845,-3.714325 -8.821914,-3.716555 -2.949092,0.0058 -5.771848,1.076123 -7.928541,3.230448 L 27.31921,66.441405 26.726551,67.034482 c -1.343545,1.346615 -2.011143,3.098821 -2.016991,4.960512 0.002,1.972136 0.773588,4.003619 2.360607,5.591331 1.585346,1.583813 3.615429,2.354624 5.587991,2.356843 1.861408,-0.0058 3.613479,-0.673017 4.961066,-2.01657 L 62.839621,52.707493 64.95174,50.595508 c 0.506025,-0.509784 0.757852,-1.15788 0.76273,-1.899994 0,-0.78236 -0.304758,-1.604703 -0.959542,-2.259625 -0.656167,-0.656452 -1.478649,-0.960092 -2.260316,-0.962321 -0.741838,0.0064 -1.388963,0.258655 -1.899442,0.765515 0,0 -17.740223,17.818896 -20.832589,21.01857 -1.223513,1.265968 -3.596261,1.14186 -4.639005,3e-6 -1.036591,-1.135118 -0.92155,-3.247965 0.417589,-4.592682 3.215314,-3.228708 20.59883,-20.877037 20.59883,-20.877037 1.744968,-1.750675 4.072705,-2.616473 6.354335,-2.610903 2.425928,-0.002 4.864259,0.956612 6.715226,2.806741 1.845669,1.848594 2.803537,4.284833 2.803537,6.711884 0.0049,2.28024 -0.859952,4.607558 -2.608679,6.353358 l -2.112816,2.111987 -25.22026,25.220118 c -2.576358,2.578306 -5.997345,3.860847 -9.393545,3.860151 l -0.01975,-1.4e-4 0,0 z"
+       d="m 52.252826,71.985813 c -5.785357,0.0013 -11.621304,-2.278927 -16.066172,-6.724255 -4.447104,-4.44643 -6.729377,-10.2846 -6.727814,-16.068849 -0.0078,-5.445499 2.04493,-10.934 6.179362,-15.06153 l 0.949145,-0.94959 57.025877,-57.028546 c 5.426554,-5.434137 12.631066,-8.130253 19.813056,-8.120449 7.63373,-0.0032 15.3508,3.007006 21.24202,8.896214 5.88542,5.888312 8.89442,13.6013808 8.89287,21.234664 0.007,7.1844448 -2.68743,14.38717 -8.12045,19.81663 -17.14676,17.144842 -33.02405,33.037368 -47.973053,47.553831 -1.820565,1.767888 -5.367769,1.977913 -7.026827,0.321035 -1.708523,-1.706278 -1.819678,-5.149272 0.321094,-7.23677 15.072546,-14.697446 47.555626,-47.764444 47.555626,-47.764444 3.44535,-3.4527124 5.1589,-7.9700196 5.16693,-12.6905604 -8e-4,-5.0020224 -1.96471,-10.1299476 -5.94292,-14.1094956 -3.97955,-3.98089 -9.11015,-5.94292 -14.11506,-5.946488 -4.71855,0.0093 -9.23496,1.721796 -12.68567,5.168716 l -57.030104,57.030322 -0.948254,0.948923 c -2.149672,2.154584 -3.217829,4.958114 -3.227186,7.936819 0.0032,3.155418 1.237741,6.405791 3.776971,8.94613 2.536554,2.534101 5.784687,3.767398 8.940786,3.770949 2.978253,-0.0093 5.781566,-1.076827 7.937705,-3.226512 l 40.352632,-40.350568 3.37939,-3.379176 c 0.80964,-0.815655 1.21257,-1.852608 1.22037,-3.039991 0,-1.251776 -0.48761,-2.5675244 -1.53527,-3.6153996 -1.04986,-1.0503232 -2.36583,-1.5361472 -3.616501,-1.5397136 -1.186941,0.01024 -2.222341,0.413848 -3.039107,1.224824 0,0 -28.384357,28.5102332 -33.332142,33.6297122 -1.957621,2.025549 -5.754018,1.826976 -7.422408,5e-6 -1.658546,-1.816189 -1.47448,-5.196744 0.668142,-7.348292 5.144502,-5.165932 32.958128,-33.4032588 32.958128,-33.4032588 2.791949,-2.80108 6.516328,-4.1863568 10.166936,-4.1774448 3.881482,-0.0032 7.782812,1.5305792 10.744362,4.4907856 2.95307,2.9577504 4.48566,6.8557328 4.48566,10.739014 0.008,3.648384 -1.37592,7.372093 -4.17389,10.165373 l -3.3805,3.379179 -40.352419,40.352189 c -4.122173,4.12529 -9.595752,6.177355 -15.029672,6.176242 l -0.0316,-2.24e-4 v 0 z"
        id="path3"
        sodipodi:nodetypes="ccccccccccsasccsccccccccccccccsasccccccccccc"
-       style="fill:#ffffff;fill-opacity:1" /></g></svg>
\ No newline at end of file
+       style="fill:#ffffff;fill-opacity:1;stroke-width:1.60000002" /></g></svg>
\ No newline at end of file
diff --git a/retroshare-gui/src/gui/icons/svg/channel-other.svg b/retroshare-gui/src/gui/icons/svg/channel-other.svg
new file mode 100644
index 000000000..d213f1416
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/svg/channel-other.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4155"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   xml:space="preserve"
+   width="128"
+   height="128"
+   viewBox="0 0 128 128"
+   sodipodi:docname="channel-other.svg"><metadata
+     id="metadata4161"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
+     id="defs4159" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1024"
+     inkscape:window-height="705"
+     id="namedview4157"
+     showgrid="false"
+     inkscape:zoom="1.8097514"
+     inkscape:cx="-49.965631"
+     inkscape:cy="35.643792"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g4163" /><g
+     id="g4163"
+     inkscape:groupmode="layer"
+     inkscape:label="ink_ext_XXXXXX"
+     transform="matrix(1.25,0,0,-1.25,0,80)"><path
+       inkscape:connector-curvature="0"
+       id="path4167"
+       style="fill:#f1cb00;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.60000002"
+       d="M 102.4,12.8 C 102.4,-15.4768 79.4768,-38.4 51.2,-38.4 22.9232,-38.4 0,-15.4768 0,12.8 0,41.0768 22.9232,64 51.2,64 79.4768,64 102.4,41.0768 102.4,12.8" /><path
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;stroke-width:0.79999691"
+       d="m 248.98415,94.44643 -0.0187,0.1875 c -0.34688,3.29687 -3.79998,32.62175 -18.05618,47.53732 -16.47808,17.54368 -35.15926,19.67492 -44.14359,20.69679 -0.74376,0.0844 -1.425,0.1625 -2.03437,0.24375 l -0.71563,0.075 c -54.14979,3.93749 -135.927597,4.47498 -136.746347,4.47811 l -0.07189,0.003 -0.0719,-0.003 c -0.81875,-0.003 -82.59655,-0.54062 -137.233842,-4.4781 l -0.721873,-0.075 c -0.581218,-0.0781 -1.22184,-0.15003 -1.918712,-0.23128 -8.881216,-1.02499 -27.362396,-3.15936 -43.887326,-21.33741 -13.57808,-14.7562 -17.50306,-43.45296 -17.90618,-46.67795 l -0.0469,-0.41875 c -0.12187,-1.37187 -3.01249,-34.031118 -3.01249,-66.818486 v -30.64988 c 0,-32.78738 2.89062,-65.44662 3.01249,-66.82162 l 0.0219,-0.20624 c 0.34687,-3.24374 3.79686,-32.031134 17.98743,-46.952954 15.49369,-16.95618 35.08423,-19.19992 45.621694,-20.40617 1.665619,-0.19063 3.099988,-0.35312 4.078109,-0.525 l 0.946872,-0.13124 c 31.265508,-2.975 129.293238,-4.44061 133.449478,-4.49999 l 0.125,-0.003 0.125,0.003 c 0.81875,0.003 82.593427,0.54063 136.743217,4.47811 l 0.71562,0.075 c 0.68437,0.0906 1.45312,0.17188 2.29687,0.25938 8.83121,0.93749 27.21239,2.88436 43.5092,20.81554 13.57807,14.75932 17.50619,43.456084 17.90618,46.677944 l 0.0469,0.41874 c 0.12188,1.375 3.01562,34.03112 3.01562,66.8185 v 30.64988 c -0.003,32.787408 -2.89375,65.443536 -3.01563,66.818526 z M 227.99362,-3.021936 c 0,-30.34675 -2.65,-61.59976 -2.9,-64.4685 -1.01874,-7.90309 -5.15936,-26.05928 -11.77495,-33.249874 -10.19996,-11.22183 -20.67804,-12.33433 -28.32801,-13.1437 -0.925,-0.0969 -1.78125,-0.19063 -2.55624,-0.2875 -52.3748,-3.78749 -131.065117,-4.36873 -134.690107,-4.39061 -4.06561,0.0594 -100.65898,1.53749 -130.97136,4.35311 -1.553118,0.25313 -3.231236,0.44688 -4.99998,0.64688 -8.97184,1.02811 -21.253043,2.43437 -30.696753,12.82182 l -0.22188,0.2375 c -6.49997,6.771854 -10.52183,23.749914 -11.5437,32.918614 -0.19063,2.16875 -2.90937,33.79051 -2.90937,64.56226 v 30.64988 c 0,30.312376 2.64374,61.531006 2.89999,64.459126 1.21562,9.30934 5.43436,26.36552 11.77496,33.25924 10.51246,11.56246 21.596789,12.8437 28.928009,13.69058 0.699998,0.0812 1.353121,0.15624 1.956244,0.23437 53.13729,3.80623 132.39323,4.37186 135.23697,4.39373 2.84374,-0.0187 82.071557,-0.5875 134.736977,-4.39373 0.64688,-0.0812 1.35312,-0.1625 2.11249,-0.25 7.54059,-0.85937 18.93743,-2.15937 29.39676,-13.31557 l 0.0969,-0.10313 c 6.49997,-6.77185 10.52183,-24.04678 11.5437,-33.39987 0.18125,-2.04686 2.90937,-33.73737 2.90937,-64.574746 z m 0,0"
+       id="path24" /><path
+       d="m 62.437944,16.256885 -16.269576,8.902003 c -0.935486,0.511849 -2.041222,0.492745 -2.958159,-0.05056 -0.917511,-0.543876 -1.464751,-1.504644 -1.464751,-2.571041 V 4.8861 c 0,-1.06134 0.543868,-2.020425 1.455198,-2.564861 0.475888,-0.284297 1.003467,-0.427007 1.532174,-0.427007 0.484319,0 0.969759,0.119673 1.416433,0.360148 l 16.270142,8.748615 c 0.965829,0.519715 1.568689,1.523748 1.573191,2.621046 0.0042,1.0973 -0.591638,2.105826 -1.554652,2.632844 z M 46.061048,7.106544 v 13.192313 l 12.15963,-6.653465 z m 0,0"
+       id="path22-4"
+       style="fill:#ffffff;stroke-width:0.14383444"
+       inkscape:connector-curvature="0" /><g
+       id="g107-6"
+       transform="matrix(0.44860463,0,0,-0.44860463,-39.480898,89.10247)"><g
+         id="g103-0"><path
+           d="m 282.79566,136.90407 -0.007,-0.0751 c -0.13903,-1.32133 -1.52298,-13.07429 -7.23664,-19.05221 -6.60416,-7.03124 -14.09128,-7.8854 -17.69207,-8.29495 -0.29808,-0.0338 -0.57112,-0.0652 -0.81534,-0.0977 l -0.2868,-0.0301 c -21.7024,-1.57808 -54.47767,-1.79351 -54.80581,-1.79475 l -0.0289,-8.4e-4 -0.0289,8.4e-4 c -0.32814,8.4e-4 -33.10341,0.21667 -55.00118,1.79475 l -0.28931,0.0301 c -0.23297,0.0312 -0.48972,0.0601 -0.769,0.0927 -3.55946,0.41079 -10.96642,1.26622 -17.58937,8.55169 -5.44187,5.91406 -7.01494,17.41528 -7.17651,18.70779 l -0.0188,0.16784 c -0.0489,0.54982 -1.20736,13.63914 -1.20736,26.7798 v 12.284 c 0,13.14067 1.15851,26.22998 1.20736,26.78106 l 0.009,0.0827 c 0.13903,1.30005 1.52172,12.83758 7.20908,18.81802 6.20962,6.79576 14.06121,7.69502 18.28446,8.17846 0.66756,0.0764 1.24243,0.14153 1.63445,0.21042 l 0.37948,0.0526 c 12.53073,1.19232 51.81872,1.77972 53.48447,1.80351 l 0.0501,0.002 0.0501,-0.002 c 0.32814,-0.002 33.10215,-0.21666 54.80455,-1.79474 l 0.28681,-0.03 c 0.27428,-0.0364 0.58238,-0.0689 0.92054,-0.10395 3.53941,-0.37573 10.9063,-1.15601 17.43782,-8.34254 5.44187,-5.91532 7.0162,-17.41652 7.1765,-18.70779 l 0.0188,-0.16783 c 0.0488,-0.55108 1.20861,-13.63913 1.20861,-26.77981 v -12.284 c -8.5e-4,-13.14067 -1.15977,-26.22875 -1.20861,-26.77982 z m -8.41269,39.06381 c 0,12.16251 -1.06208,24.68823 -1.16226,25.83797 -0.4083,3.16743 -2.06779,10.44414 -4.71923,13.32602 -4.08798,4.49755 -8.28744,4.94342 -11.35341,5.26779 -0.37073,0.0388 -0.71391,0.0764 -1.02451,0.11522 -20.991,1.51797 -52.52885,1.75092 -53.98169,1.75969 -1.62944,-0.0238 -40.34255,-0.6162 -52.49127,-1.74466 -0.62248,-0.10144 -1.29504,-0.17909 -2.00393,-0.25925 -3.59576,-0.41206 -8.51788,-0.97565 -12.30278,-5.13879 l -0.089,-0.0951 c -2.60509,-2.71405 -4.21699,-9.51859 -4.62654,-13.19327 -0.0764,-0.86921 -1.16603,-13.5427 -1.16603,-25.87554 v -12.284 c 0,-12.14872 1.05958,-24.66067 1.16228,-25.83421 0.4872,-3.73104 2.17799,-10.56689 4.71921,-13.32978 4.21323,-4.63405 8.65566,-5.14756 11.5939,-5.48698 0.28055,-0.0326 0.54231,-0.0627 0.78404,-0.0939 21.29658,-1.52547 53.06113,-1.75217 54.20086,-1.76093 1.13972,0.007 32.89299,0.23546 54.00047,1.76093 0.25926,0.0326 0.54232,0.0651 0.84666,0.10021 3.02215,0.34442 7.58982,0.86545 11.78175,5.33667 l 0.0389,0.0413 c 2.60509,2.71404 4.21698,9.63757 4.62653,13.38614 0.0727,0.82034 1.16603,13.52141 1.16603,25.88055 z m 0,0"
+           id="path24-7"
+           style="fill:#ffffff;stroke-width:0.32062626"
+           inkscape:connector-curvature="0" /></g></g></g></svg>
\ No newline at end of file
diff --git a/retroshare-gui/src/gui/icons/svg/channel-popular.svg b/retroshare-gui/src/gui/icons/svg/channel-popular.svg
new file mode 100644
index 000000000..8a2f84102
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/svg/channel-popular.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4155"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   xml:space="preserve"
+   width="128"
+   height="128"
+   viewBox="0 0 128 128"
+   sodipodi:docname="channel-popular.svg"><metadata
+     id="metadata4161"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs4159" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1024"
+     inkscape:window-height="705"
+     id="namedview4157"
+     showgrid="false"
+     inkscape:zoom="1.8097514"
+     inkscape:cx="8.8995259"
+     inkscape:cy="66.93354"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g4163" /><g
+     id="g4163"
+     inkscape:groupmode="layer"
+     inkscape:label="ink_ext_XXXXXX"
+     transform="matrix(1.25,0,0,-1.25,0,80)"><path
+       inkscape:connector-curvature="0"
+       id="path4167"
+       style="fill:#00b400;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.60000002"
+       d="M 102.4,12.8 C 102.4,-15.4768 79.4768,-38.4 51.2,-38.4 22.9232,-38.4 0,-15.4768 0,12.8 0,41.0768 22.9232,64 51.2,64 79.4768,64 102.4,41.0768 102.4,12.8" /><path
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;stroke-width:0.79999691"
+       d="m 248.98415,94.44643 -0.0187,0.1875 c -0.34688,3.29687 -3.79998,32.62175 -18.05618,47.53732 -16.47808,17.54368 -35.15926,19.67492 -44.14359,20.69679 -0.74376,0.0844 -1.425,0.1625 -2.03437,0.24375 l -0.71563,0.075 c -54.14979,3.93749 -135.927597,4.47498 -136.746347,4.47811 l -0.07189,0.003 -0.0719,-0.003 c -0.81875,-0.003 -82.59655,-0.54062 -137.233842,-4.4781 l -0.721873,-0.075 c -0.581218,-0.0781 -1.22184,-0.15003 -1.918712,-0.23128 -8.881216,-1.02499 -27.362396,-3.15936 -43.887326,-21.33741 -13.57808,-14.7562 -17.50306,-43.45296 -17.90618,-46.67795 l -0.0469,-0.41875 c -0.12187,-1.37187 -3.01249,-34.031118 -3.01249,-66.818486 v -30.64988 c 0,-32.78738 2.89062,-65.44662 3.01249,-66.82162 l 0.0219,-0.20624 c 0.34687,-3.24374 3.79686,-32.031134 17.98743,-46.952954 15.49369,-16.95618 35.08423,-19.19992 45.621694,-20.40617 1.665619,-0.19063 3.099988,-0.35312 4.078109,-0.525 l 0.946872,-0.13124 c 31.265508,-2.975 129.293238,-4.44061 133.449478,-4.49999 l 0.125,-0.003 0.125,0.003 c 0.81875,0.003 82.593427,0.54063 136.743217,4.47811 l 0.71562,0.075 c 0.68437,0.0906 1.45312,0.17188 2.29687,0.25938 8.83121,0.93749 27.21239,2.88436 43.5092,20.81554 13.57807,14.75932 17.50619,43.456084 17.90618,46.677944 l 0.0469,0.41874 c 0.12188,1.375 3.01562,34.03112 3.01562,66.8185 v 30.64988 c -0.003,32.787408 -2.89375,65.443536 -3.01563,66.818526 z M 227.99362,-3.021936 c 0,-30.34675 -2.65,-61.59976 -2.9,-64.4685 -1.01874,-7.90309 -5.15936,-26.05928 -11.77495,-33.249874 -10.19996,-11.22183 -20.67804,-12.33433 -28.32801,-13.1437 -0.925,-0.0969 -1.78125,-0.19063 -2.55624,-0.2875 -52.3748,-3.78749 -131.065117,-4.36873 -134.690107,-4.39061 -4.06561,0.0594 -100.65898,1.53749 -130.97136,4.35311 -1.553118,0.25313 -3.231236,0.44688 -4.99998,0.64688 -8.97184,1.02811 -21.253043,2.43437 -30.696753,12.82182 l -0.22188,0.2375 c -6.49997,6.771854 -10.52183,23.749914 -11.5437,32.918614 -0.19063,2.16875 -2.90937,33.79051 -2.90937,64.56226 v 30.64988 c 0,30.312376 2.64374,61.531006 2.89999,64.459126 1.21562,9.30934 5.43436,26.36552 11.77496,33.25924 10.51246,11.56246 21.596789,12.8437 28.928009,13.69058 0.699998,0.0812 1.353121,0.15624 1.956244,0.23437 53.13729,3.80623 132.39323,4.37186 135.23697,4.39373 2.84374,-0.0187 82.071557,-0.5875 134.736977,-4.39373 0.64688,-0.0812 1.35312,-0.1625 2.11249,-0.25 7.54059,-0.85937 18.93743,-2.15937 29.39676,-13.31557 l 0.0969,-0.10313 c 6.49997,-6.77185 10.52183,-24.04678 11.5437,-33.39987 0.18125,-2.04686 2.90937,-33.73737 2.90937,-64.574746 z m 0,0"
+       id="path24" /><path
+       d="m 62.437944,16.256885 -16.269576,8.902003 c -0.935486,0.511849 -2.041222,0.492745 -2.958159,-0.05056 -0.917511,-0.543876 -1.464751,-1.504644 -1.464751,-2.571041 V 4.8861 c 0,-1.06134 0.543868,-2.020425 1.455198,-2.564861 0.475888,-0.284297 1.003467,-0.427007 1.532174,-0.427007 0.484319,0 0.969759,0.119673 1.416433,0.360148 l 16.270142,8.748615 c 0.965829,0.519715 1.568689,1.523748 1.573191,2.621046 0.0042,1.0973 -0.591638,2.105826 -1.554652,2.632844 z M 46.061048,7.106544 v 13.192313 l 12.15963,-6.653465 z m 0,0"
+       id="path22-4"
+       style="fill:#ffffff;stroke-width:0.14383444"
+       inkscape:connector-curvature="0" /><g
+       id="g107-6"
+       transform="matrix(0.44860463,0,0,-0.44860463,-39.480898,89.10247)"><g
+         id="g103-0"><path
+           d="m 282.79566,136.90407 -0.007,-0.0751 c -0.13903,-1.32133 -1.52298,-13.07429 -7.23664,-19.05221 -6.60416,-7.03124 -14.09128,-7.8854 -17.69207,-8.29495 -0.29808,-0.0338 -0.57112,-0.0652 -0.81534,-0.0977 l -0.2868,-0.0301 c -21.7024,-1.57808 -54.47767,-1.79351 -54.80581,-1.79475 l -0.0289,-8.4e-4 -0.0289,8.4e-4 c -0.32814,8.4e-4 -33.10341,0.21667 -55.00118,1.79475 l -0.28931,0.0301 c -0.23297,0.0312 -0.48972,0.0601 -0.769,0.0927 -3.55946,0.41079 -10.96642,1.26622 -17.58937,8.55169 -5.44187,5.91406 -7.01494,17.41528 -7.17651,18.70779 l -0.0188,0.16784 c -0.0489,0.54982 -1.20736,13.63914 -1.20736,26.7798 v 12.284 c 0,13.14067 1.15851,26.22998 1.20736,26.78106 l 0.009,0.0827 c 0.13903,1.30005 1.52172,12.83758 7.20908,18.81802 6.20962,6.79576 14.06121,7.69502 18.28446,8.17846 0.66756,0.0764 1.24243,0.14153 1.63445,0.21042 l 0.37948,0.0526 c 12.53073,1.19232 51.81872,1.77972 53.48447,1.80351 l 0.0501,0.002 0.0501,-0.002 c 0.32814,-0.002 33.10215,-0.21666 54.80455,-1.79474 l 0.28681,-0.03 c 0.27428,-0.0364 0.58238,-0.0689 0.92054,-0.10395 3.53941,-0.37573 10.9063,-1.15601 17.43782,-8.34254 5.44187,-5.91532 7.0162,-17.41652 7.1765,-18.70779 l 0.0188,-0.16783 c 0.0488,-0.55108 1.20861,-13.63913 1.20861,-26.77981 v -12.284 c -8.5e-4,-13.14067 -1.15977,-26.22875 -1.20861,-26.77982 z m -8.41269,39.06381 c 0,12.16251 -1.06208,24.68823 -1.16226,25.83797 -0.4083,3.16743 -2.06779,10.44414 -4.71923,13.32602 -4.08798,4.49755 -8.28744,4.94342 -11.35341,5.26779 -0.37073,0.0388 -0.71391,0.0764 -1.02451,0.11522 -20.991,1.51797 -52.52885,1.75092 -53.98169,1.75969 -1.62944,-0.0238 -40.34255,-0.6162 -52.49127,-1.74466 -0.62248,-0.10144 -1.29504,-0.17909 -2.00393,-0.25925 -3.59576,-0.41206 -8.51788,-0.97565 -12.30278,-5.13879 l -0.089,-0.0951 c -2.60509,-2.71405 -4.21699,-9.51859 -4.62654,-13.19327 -0.0764,-0.86921 -1.16603,-13.5427 -1.16603,-25.87554 v -12.284 c 0,-12.14872 1.05958,-24.66067 1.16228,-25.83421 0.4872,-3.73104 2.17799,-10.56689 4.71921,-13.32978 4.21323,-4.63405 8.65566,-5.14756 11.5939,-5.48698 0.28055,-0.0326 0.54231,-0.0627 0.78404,-0.0939 21.29658,-1.52547 53.06113,-1.75217 54.20086,-1.76093 1.13972,0.007 32.89299,0.23546 54.00047,1.76093 0.25926,0.0326 0.54232,0.0651 0.84666,0.10021 3.02215,0.34442 7.58982,0.86545 11.78175,5.33667 l 0.0389,0.0413 c 2.60509,2.71404 4.21698,9.63757 4.62653,13.38614 0.0727,0.82034 1.16603,13.52141 1.16603,25.88055 z m 0,0"
+           id="path24-7"
+           style="fill:#ffffff;stroke-width:0.32062626"
+           inkscape:connector-curvature="0" /></g></g></g></svg>
\ No newline at end of file
diff --git a/retroshare-gui/src/gui/icons/svg/channel-subscribed.svg b/retroshare-gui/src/gui/icons/svg/channel-subscribed.svg
new file mode 100644
index 000000000..3cf2fa3f0
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/svg/channel-subscribed.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4155"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   xml:space="preserve"
+   width="128"
+   height="128"
+   viewBox="0 0 128 128"
+   sodipodi:docname="channel-subscribed.svg"><metadata
+     id="metadata4161"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs4159" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1024"
+     inkscape:window-height="705"
+     id="namedview4157"
+     showgrid="false"
+     inkscape:zoom="1.8097514"
+     inkscape:cx="-43.177081"
+     inkscape:cy="35.643792"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g4163" /><g
+     id="g4163"
+     inkscape:groupmode="layer"
+     inkscape:label="ink_ext_XXXXXX"
+     transform="matrix(1.25,0,0,-1.25,0,80)"><path
+       inkscape:connector-curvature="0"
+       id="path4167"
+       style="fill:#d40000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.60000002"
+       d="M 102.4,12.8 C 102.4,-15.4768 79.4768,-38.4 51.2,-38.4 22.9232,-38.4 0,-15.4768 0,12.8 0,41.0768 22.9232,64 51.2,64 79.4768,64 102.4,41.0768 102.4,12.8" /><path
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;stroke-width:0.79999691"
+       d="m 248.98415,94.44643 -0.0187,0.1875 c -0.34688,3.29687 -3.79998,32.62175 -18.05618,47.53732 -16.47808,17.54368 -35.15926,19.67492 -44.14359,20.69679 -0.74376,0.0844 -1.425,0.1625 -2.03437,0.24375 l -0.71563,0.075 c -54.14979,3.93749 -135.927597,4.47498 -136.746347,4.47811 l -0.07189,0.003 -0.0719,-0.003 c -0.81875,-0.003 -82.59655,-0.54062 -137.233842,-4.4781 l -0.721873,-0.075 c -0.581218,-0.0781 -1.22184,-0.15003 -1.918712,-0.23128 -8.881216,-1.02499 -27.362396,-3.15936 -43.887326,-21.33741 -13.57808,-14.7562 -17.50306,-43.45296 -17.90618,-46.67795 l -0.0469,-0.41875 c -0.12187,-1.37187 -3.01249,-34.031118 -3.01249,-66.818486 v -30.64988 c 0,-32.78738 2.89062,-65.44662 3.01249,-66.82162 l 0.0219,-0.20624 c 0.34687,-3.24374 3.79686,-32.031134 17.98743,-46.952954 15.49369,-16.95618 35.08423,-19.19992 45.621694,-20.40617 1.665619,-0.19063 3.099988,-0.35312 4.078109,-0.525 l 0.946872,-0.13124 c 31.265508,-2.975 129.293238,-4.44061 133.449478,-4.49999 l 0.125,-0.003 0.125,0.003 c 0.81875,0.003 82.593427,0.54063 136.743217,4.47811 l 0.71562,0.075 c 0.68437,0.0906 1.45312,0.17188 2.29687,0.25938 8.83121,0.93749 27.21239,2.88436 43.5092,20.81554 13.57807,14.75932 17.50619,43.456084 17.90618,46.677944 l 0.0469,0.41874 c 0.12188,1.375 3.01562,34.03112 3.01562,66.8185 v 30.64988 c -0.003,32.787408 -2.89375,65.443536 -3.01563,66.818526 z M 227.99362,-3.021936 c 0,-30.34675 -2.65,-61.59976 -2.9,-64.4685 -1.01874,-7.90309 -5.15936,-26.05928 -11.77495,-33.249874 -10.19996,-11.22183 -20.67804,-12.33433 -28.32801,-13.1437 -0.925,-0.0969 -1.78125,-0.19063 -2.55624,-0.2875 -52.3748,-3.78749 -131.065117,-4.36873 -134.690107,-4.39061 -4.06561,0.0594 -100.65898,1.53749 -130.97136,4.35311 -1.553118,0.25313 -3.231236,0.44688 -4.99998,0.64688 -8.97184,1.02811 -21.253043,2.43437 -30.696753,12.82182 l -0.22188,0.2375 c -6.49997,6.771854 -10.52183,23.749914 -11.5437,32.918614 -0.19063,2.16875 -2.90937,33.79051 -2.90937,64.56226 v 30.64988 c 0,30.312376 2.64374,61.531006 2.89999,64.459126 1.21562,9.30934 5.43436,26.36552 11.77496,33.25924 10.51246,11.56246 21.596789,12.8437 28.928009,13.69058 0.699998,0.0812 1.353121,0.15624 1.956244,0.23437 53.13729,3.80623 132.39323,4.37186 135.23697,4.39373 2.84374,-0.0187 82.071557,-0.5875 134.736977,-4.39373 0.64688,-0.0812 1.35312,-0.1625 2.11249,-0.25 7.54059,-0.85937 18.93743,-2.15937 29.39676,-13.31557 l 0.0969,-0.10313 c 6.49997,-6.77185 10.52183,-24.04678 11.5437,-33.39987 0.18125,-2.04686 2.90937,-33.73737 2.90937,-64.574746 z m 0,0"
+       id="path24" /><path
+       d="m 62.437944,16.256885 -16.269576,8.902003 c -0.935486,0.511849 -2.041222,0.492745 -2.958159,-0.05056 -0.917511,-0.543876 -1.464751,-1.504644 -1.464751,-2.571041 V 4.8861 c 0,-1.06134 0.543868,-2.020425 1.455198,-2.564861 0.475888,-0.284297 1.003467,-0.427007 1.532174,-0.427007 0.484319,0 0.969759,0.119673 1.416433,0.360148 l 16.270142,8.748615 c 0.965829,0.519715 1.568689,1.523748 1.573191,2.621046 0.0042,1.0973 -0.591638,2.105826 -1.554652,2.632844 z M 46.061048,7.106544 v 13.192313 l 12.15963,-6.653465 z m 0,0"
+       id="path22-4"
+       style="fill:#ffffff;stroke-width:0.14383444"
+       inkscape:connector-curvature="0" /><g
+       id="g107-6"
+       transform="matrix(0.44860463,0,0,-0.44860463,-39.480898,89.10247)"><g
+         id="g103-0"><path
+           d="m 282.79566,136.90407 -0.007,-0.0751 c -0.13903,-1.32133 -1.52298,-13.07429 -7.23664,-19.05221 -6.60416,-7.03124 -14.09128,-7.8854 -17.69207,-8.29495 -0.29808,-0.0338 -0.57112,-0.0652 -0.81534,-0.0977 l -0.2868,-0.0301 c -21.7024,-1.57808 -54.47767,-1.79351 -54.80581,-1.79475 l -0.0289,-8.4e-4 -0.0289,8.4e-4 c -0.32814,8.4e-4 -33.10341,0.21667 -55.00118,1.79475 l -0.28931,0.0301 c -0.23297,0.0312 -0.48972,0.0601 -0.769,0.0927 -3.55946,0.41079 -10.96642,1.26622 -17.58937,8.55169 -5.44187,5.91406 -7.01494,17.41528 -7.17651,18.70779 l -0.0188,0.16784 c -0.0489,0.54982 -1.20736,13.63914 -1.20736,26.7798 v 12.284 c 0,13.14067 1.15851,26.22998 1.20736,26.78106 l 0.009,0.0827 c 0.13903,1.30005 1.52172,12.83758 7.20908,18.81802 6.20962,6.79576 14.06121,7.69502 18.28446,8.17846 0.66756,0.0764 1.24243,0.14153 1.63445,0.21042 l 0.37948,0.0526 c 12.53073,1.19232 51.81872,1.77972 53.48447,1.80351 l 0.0501,0.002 0.0501,-0.002 c 0.32814,-0.002 33.10215,-0.21666 54.80455,-1.79474 l 0.28681,-0.03 c 0.27428,-0.0364 0.58238,-0.0689 0.92054,-0.10395 3.53941,-0.37573 10.9063,-1.15601 17.43782,-8.34254 5.44187,-5.91532 7.0162,-17.41652 7.1765,-18.70779 l 0.0188,-0.16783 c 0.0488,-0.55108 1.20861,-13.63913 1.20861,-26.77981 v -12.284 c -8.5e-4,-13.14067 -1.15977,-26.22875 -1.20861,-26.77982 z m -8.41269,39.06381 c 0,12.16251 -1.06208,24.68823 -1.16226,25.83797 -0.4083,3.16743 -2.06779,10.44414 -4.71923,13.32602 -4.08798,4.49755 -8.28744,4.94342 -11.35341,5.26779 -0.37073,0.0388 -0.71391,0.0764 -1.02451,0.11522 -20.991,1.51797 -52.52885,1.75092 -53.98169,1.75969 -1.62944,-0.0238 -40.34255,-0.6162 -52.49127,-1.74466 -0.62248,-0.10144 -1.29504,-0.17909 -2.00393,-0.25925 -3.59576,-0.41206 -8.51788,-0.97565 -12.30278,-5.13879 l -0.089,-0.0951 c -2.60509,-2.71405 -4.21699,-9.51859 -4.62654,-13.19327 -0.0764,-0.86921 -1.16603,-13.5427 -1.16603,-25.87554 v -12.284 c 0,-12.14872 1.05958,-24.66067 1.16228,-25.83421 0.4872,-3.73104 2.17799,-10.56689 4.71921,-13.32978 4.21323,-4.63405 8.65566,-5.14756 11.5939,-5.48698 0.28055,-0.0326 0.54231,-0.0627 0.78404,-0.0939 21.29658,-1.52547 53.06113,-1.75217 54.20086,-1.76093 1.13972,0.007 32.89299,0.23546 54.00047,1.76093 0.25926,0.0326 0.54232,0.0651 0.84666,0.10021 3.02215,0.34442 7.58982,0.86545 11.78175,5.33667 l 0.0389,0.0413 c 2.60509,2.71404 4.21698,9.63757 4.62653,13.38614 0.0727,0.82034 1.16603,13.52141 1.16603,25.88055 z m 0,0"
+           id="path24-7"
+           style="fill:#ffffff;stroke-width:0.32062626"
+           inkscape:connector-curvature="0" /></g></g></g></svg>
\ No newline at end of file
diff --git a/retroshare-gui/src/gui/icons/svg/channel.svg b/retroshare-gui/src/gui/icons/svg/channel.svg
new file mode 100644
index 000000000..5e61474e8
--- /dev/null
+++ b/retroshare-gui/src/gui/icons/svg/channel.svg
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg4155"
+   version="1.1"
+   inkscape:version="0.92.3 (2405546, 2018-03-11)"
+   xml:space="preserve"
+   width="128"
+   height="128"
+   viewBox="0 0 128 128"
+   sodipodi:docname="channel.svg"><metadata
+     id="metadata4161"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs4159" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1024"
+     inkscape:window-height="705"
+     id="namedview4157"
+     showgrid="false"
+     inkscape:zoom="1.8097514"
+     inkscape:cx="50.758472"
+     inkscape:cy="70.230868"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="g4163" /><g
+     id="g4163"
+     inkscape:groupmode="layer"
+     inkscape:label="ink_ext_XXXXXX"
+     transform="matrix(1.25,0,0,-1.25,0,80)"><path
+       inkscape:connector-curvature="0"
+       id="path4167"
+       style="fill:#039bd5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.60000002"
+       d="M 102.4,12.8 C 102.4,-15.4768 79.4768,-38.4 51.2,-38.4 22.9232,-38.4 0,-15.4768 0,12.8 0,41.0768 22.9232,64 51.2,64 79.4768,64 102.4,41.0768 102.4,12.8" /><path
+       inkscape:connector-curvature="0"
+       style="fill:#ffffff;stroke-width:0.79999691"
+       d="m 248.98415,94.44643 -0.0187,0.1875 c -0.34688,3.29687 -3.79998,32.62175 -18.05618,47.53732 -16.47808,17.54368 -35.15926,19.67492 -44.14359,20.69679 -0.74376,0.0844 -1.425,0.1625 -2.03437,0.24375 l -0.71563,0.075 c -54.14979,3.93749 -135.927597,4.47498 -136.746347,4.47811 l -0.07189,0.003 -0.0719,-0.003 c -0.81875,-0.003 -82.59655,-0.54062 -137.233842,-4.4781 l -0.721873,-0.075 c -0.581218,-0.0781 -1.22184,-0.15003 -1.918712,-0.23128 -8.881216,-1.02499 -27.362396,-3.15936 -43.887326,-21.33741 -13.57808,-14.7562 -17.50306,-43.45296 -17.90618,-46.67795 l -0.0469,-0.41875 c -0.12187,-1.37187 -3.01249,-34.031118 -3.01249,-66.818486 v -30.64988 c 0,-32.78738 2.89062,-65.44662 3.01249,-66.82162 l 0.0219,-0.20624 c 0.34687,-3.24374 3.79686,-32.031134 17.98743,-46.952954 15.49369,-16.95618 35.08423,-19.19992 45.621694,-20.40617 1.665619,-0.19063 3.099988,-0.35312 4.078109,-0.525 l 0.946872,-0.13124 c 31.265508,-2.975 129.293238,-4.44061 133.449478,-4.49999 l 0.125,-0.003 0.125,0.003 c 0.81875,0.003 82.593427,0.54063 136.743217,4.47811 l 0.71562,0.075 c 0.68437,0.0906 1.45312,0.17188 2.29687,0.25938 8.83121,0.93749 27.21239,2.88436 43.5092,20.81554 13.57807,14.75932 17.50619,43.456084 17.90618,46.677944 l 0.0469,0.41874 c 0.12188,1.375 3.01562,34.03112 3.01562,66.8185 v 30.64988 c -0.003,32.787408 -2.89375,65.443536 -3.01563,66.818526 z M 227.99362,-3.021936 c 0,-30.34675 -2.65,-61.59976 -2.9,-64.4685 -1.01874,-7.90309 -5.15936,-26.05928 -11.77495,-33.249874 -10.19996,-11.22183 -20.67804,-12.33433 -28.32801,-13.1437 -0.925,-0.0969 -1.78125,-0.19063 -2.55624,-0.2875 -52.3748,-3.78749 -131.065117,-4.36873 -134.690107,-4.39061 -4.06561,0.0594 -100.65898,1.53749 -130.97136,4.35311 -1.553118,0.25313 -3.231236,0.44688 -4.99998,0.64688 -8.97184,1.02811 -21.253043,2.43437 -30.696753,12.82182 l -0.22188,0.2375 c -6.49997,6.771854 -10.52183,23.749914 -11.5437,32.918614 -0.19063,2.16875 -2.90937,33.79051 -2.90937,64.56226 v 30.64988 c 0,30.312376 2.64374,61.531006 2.89999,64.459126 1.21562,9.30934 5.43436,26.36552 11.77496,33.25924 10.51246,11.56246 21.596789,12.8437 28.928009,13.69058 0.699998,0.0812 1.353121,0.15624 1.956244,0.23437 53.13729,3.80623 132.39323,4.37186 135.23697,4.39373 2.84374,-0.0187 82.071557,-0.5875 134.736977,-4.39373 0.64688,-0.0812 1.35312,-0.1625 2.11249,-0.25 7.54059,-0.85937 18.93743,-2.15937 29.39676,-13.31557 l 0.0969,-0.10313 c 6.49997,-6.77185 10.52183,-24.04678 11.5437,-33.39987 0.18125,-2.04686 2.90937,-33.73737 2.90937,-64.574746 z m 0,0"
+       id="path24" /><path
+       d="m 62.437944,16.256885 -16.269576,8.902003 c -0.935486,0.511849 -2.041222,0.492745 -2.958159,-0.05056 -0.917511,-0.543876 -1.464751,-1.504644 -1.464751,-2.571041 V 4.8861 c 0,-1.06134 0.543868,-2.020425 1.455198,-2.564861 0.475888,-0.284297 1.003467,-0.427007 1.532174,-0.427007 0.484319,0 0.969759,0.119673 1.416433,0.360148 l 16.270142,8.748615 c 0.965829,0.519715 1.568689,1.523748 1.573191,2.621046 0.0042,1.0973 -0.591638,2.105826 -1.554652,2.632844 z M 46.061048,7.106544 v 13.192313 l 12.15963,-6.653465 z m 0,0"
+       id="path22-4"
+       style="fill:#ffffff;stroke-width:0.14383444"
+       inkscape:connector-curvature="0" /><g
+       id="g107-6"
+       transform="matrix(0.44860463,0,0,-0.44860463,-39.480898,89.10247)"><g
+         id="g103-0"><path
+           d="m 282.79566,136.90407 -0.007,-0.0751 c -0.13903,-1.32133 -1.52298,-13.07429 -7.23664,-19.05221 -6.60416,-7.03124 -14.09128,-7.8854 -17.69207,-8.29495 -0.29808,-0.0338 -0.57112,-0.0652 -0.81534,-0.0977 l -0.2868,-0.0301 c -21.7024,-1.57808 -54.47767,-1.79351 -54.80581,-1.79475 l -0.0289,-8.4e-4 -0.0289,8.4e-4 c -0.32814,8.4e-4 -33.10341,0.21667 -55.00118,1.79475 l -0.28931,0.0301 c -0.23297,0.0312 -0.48972,0.0601 -0.769,0.0927 -3.55946,0.41079 -10.96642,1.26622 -17.58937,8.55169 -5.44187,5.91406 -7.01494,17.41528 -7.17651,18.70779 l -0.0188,0.16784 c -0.0489,0.54982 -1.20736,13.63914 -1.20736,26.7798 v 12.284 c 0,13.14067 1.15851,26.22998 1.20736,26.78106 l 0.009,0.0827 c 0.13903,1.30005 1.52172,12.83758 7.20908,18.81802 6.20962,6.79576 14.06121,7.69502 18.28446,8.17846 0.66756,0.0764 1.24243,0.14153 1.63445,0.21042 l 0.37948,0.0526 c 12.53073,1.19232 51.81872,1.77972 53.48447,1.80351 l 0.0501,0.002 0.0501,-0.002 c 0.32814,-0.002 33.10215,-0.21666 54.80455,-1.79474 l 0.28681,-0.03 c 0.27428,-0.0364 0.58238,-0.0689 0.92054,-0.10395 3.53941,-0.37573 10.9063,-1.15601 17.43782,-8.34254 5.44187,-5.91532 7.0162,-17.41652 7.1765,-18.70779 l 0.0188,-0.16783 c 0.0488,-0.55108 1.20861,-13.63913 1.20861,-26.77981 v -12.284 c -8.5e-4,-13.14067 -1.15977,-26.22875 -1.20861,-26.77982 z m -8.41269,39.06381 c 0,12.16251 -1.06208,24.68823 -1.16226,25.83797 -0.4083,3.16743 -2.06779,10.44414 -4.71923,13.32602 -4.08798,4.49755 -8.28744,4.94342 -11.35341,5.26779 -0.37073,0.0388 -0.71391,0.0764 -1.02451,0.11522 -20.991,1.51797 -52.52885,1.75092 -53.98169,1.75969 -1.62944,-0.0238 -40.34255,-0.6162 -52.49127,-1.74466 -0.62248,-0.10144 -1.29504,-0.17909 -2.00393,-0.25925 -3.59576,-0.41206 -8.51788,-0.97565 -12.30278,-5.13879 l -0.089,-0.0951 c -2.60509,-2.71405 -4.21699,-9.51859 -4.62654,-13.19327 -0.0764,-0.86921 -1.16603,-13.5427 -1.16603,-25.87554 v -12.284 c 0,-12.14872 1.05958,-24.66067 1.16228,-25.83421 0.4872,-3.73104 2.17799,-10.56689 4.71921,-13.32978 4.21323,-4.63405 8.65566,-5.14756 11.5939,-5.48698 0.28055,-0.0326 0.54231,-0.0627 0.78404,-0.0939 21.29658,-1.52547 53.06113,-1.75217 54.20086,-1.76093 1.13972,0.007 32.89299,0.23546 54.00047,1.76093 0.25926,0.0326 0.54232,0.0651 0.84666,0.10021 3.02215,0.34442 7.58982,0.86545 11.78175,5.33667 l 0.0389,0.0413 c 2.60509,2.71404 4.21698,9.63757 4.62653,13.38614 0.0727,0.82034 1.16603,13.52141 1.16603,25.88055 z m 0,0"
+           id="path24-7"
+           style="fill:#ffffff;stroke-width:0.32062626"
+           inkscape:connector-curvature="0" /></g></g></g></svg>
\ No newline at end of file
diff --git a/retroshare-gui/src/gui/icons/svg/home.svg b/retroshare-gui/src/gui/icons/svg/home.svg
index a0c838b66..6c04822fc 100644
--- a/retroshare-gui/src/gui/icons/svg/home.svg
+++ b/retroshare-gui/src/gui/icons/svg/home.svg
@@ -13,9 +13,9 @@
    version="1.1"
    inkscape:version="0.92.3 (2405546, 2018-03-11)"
    xml:space="preserve"
-   width="80"
-   height="80"
-   viewBox="0 0 80 80"
+   width="128"
+   height="128"
+   viewBox="0 0 128 128"
    sodipodi:docname="home.svg"><metadata
      id="metadata4161"><rdf:RDF><cc:Work
          rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
@@ -43,7 +43,7 @@
      id="g4163"
      inkscape:groupmode="layer"
      inkscape:label="ink_ext_XXXXXX"
-     transform="matrix(1.25,0,0,-1.25,0,80)"><path
+     transform="matrix(1.25,0,0,-1.25,0,128)"><path
        inkscape:connector-curvature="0"
        id="path4167"
        style="fill:#039bd5;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.60000002"
@@ -51,6 +51,6 @@
        id="g3935"
        transform="matrix(0.1570474,0,0,-0.1570474,10.852286,93.087381)"><g
          id="home"><polygon
-           points="204,318.75 306,318.75 306,471.75 433.5,471.75 433.5,267.75 510,267.75 255,38.25 0,267.75 76.5,267.75 76.5,471.75 204,471.75 "
+           points="433.5,267.75 510,267.75 255,38.25 0,267.75 76.5,267.75 76.5,471.75 204,471.75 204,318.75 306,318.75 306,471.75 433.5,471.75 "
            id="polygon3932"
            style="fill:#ffffff" /></g></g></g></svg>
\ No newline at end of file