diff --git a/retroshare-gui/src/gui/ChannelFeed.cpp b/retroshare-gui/src/gui/ChannelFeed.cpp
index f42dc5680..5c2788c80 100644
--- a/retroshare-gui/src/gui/ChannelFeed.cpp
+++ b/retroshare-gui/src/gui/ChannelFeed.cpp
@@ -48,6 +48,12 @@
 
 #define WARNING_LIMIT 3600*24*2
 
+/* Images for TreeWidget */
+#define IMAGE_CHANNELBLUE     ":/images/channelsblue.png"
+#define IMAGE_CHANNELGREEN    ":/images/channelsgreen.png"
+#define IMAGE_CHANNELRED      ":/images/channelsred.png"
+#define IMAGE_CHANNELYELLOW   ":/images/channelsyellow.png"
+
 /****
  * #define CHAN_DEBUG
  ***/
@@ -80,10 +86,10 @@ ChannelFeed::ChannelFeed(QWidget *parent)
     /* Initialize group tree */
     treeWidget->initDisplayMenu(displayButton);
 
-    ownChannels = treeWidget->addCategoryItem(tr("Own Channels"), QIcon(), true);
-    subcribedChannels = treeWidget->addCategoryItem(tr("Subscribed Channels"), QIcon(), true);
-    popularChannels = treeWidget->addCategoryItem(tr("Popular Channels"), QIcon(), false);
-    otherChannels = treeWidget->addCategoryItem(tr("Other Channels"), QIcon(), false);
+    ownChannels = treeWidget->addCategoryItem(tr("Own Channels"), QIcon(IMAGE_CHANNELBLUE), true);
+    subcribedChannels = treeWidget->addCategoryItem(tr("Subscribed Channels"), QIcon(IMAGE_CHANNELRED), true);
+    popularChannels = treeWidget->addCategoryItem(tr("Popular Channels"), QIcon(IMAGE_CHANNELGREEN ), false);
+    otherChannels = treeWidget->addCategoryItem(tr("Other Channels"), QIcon(IMAGE_CHANNELYELLOW), false);
 
     progressLabel->hide();
     progressBar->hide();
diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp
index 0f7f4f8aa..a8430f445 100644
--- a/retroshare-gui/src/gui/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/MessagesDialog.cpp
@@ -220,12 +220,14 @@ MessagesDialog::MessagesDialog(QWidget *parent)
     ui.viewtoolButton->setMenu(viewmenu);
 
     /* add filter actions */
-    ui.filterLineEdit->addFilter(QIcon(), tr("Subject"), COLUMN_SUBJECT);
-    ui.filterLineEdit->addFilter(QIcon(), tr("From"), COLUMN_FROM);
-    ui.filterLineEdit->addFilter(QIcon(), tr("Date"), COLUMN_DATE);
-    ui.filterLineEdit->addFilter(QIcon(), tr("Content"), COLUMN_CONTENT);
-    ui.filterLineEdit->addFilter(QIcon(), tr("Tags"), COLUMN_TAGS);
-    ui.filterLineEdit->addFilter(QIcon(), tr("Attachments"), COLUMN_ATTACHEMENTS);
+    ui.filterLineEdit->addFilter(QIcon(), tr("Subject"), COLUMN_SUBJECT, tr("Search Subject"));
+    ui.filterLineEdit->addFilter(QIcon(), tr("From"), COLUMN_FROM, tr("Search From"));
+    ui.filterLineEdit->addFilter(QIcon(), tr("Date"), COLUMN_DATE, tr("Search Date"));
+    ui.filterLineEdit->addFilter(QIcon(), tr("Content"), COLUMN_CONTENT, tr("Search Content"));
+    ui.filterLineEdit->addFilter(QIcon(), tr("Tags"), COLUMN_TAGS, tr("Search Tags"));
+    ui.filterLineEdit->addFilter(QIcon(), tr("Attachments"), COLUMN_ATTACHEMENTS, tr("Search Attachments"));
+    // can be removed when the actions of the filter line edit have own placeholder text
+    ui.filterLineEdit->setPlaceholderText(tr("Search...")) ;
 
     //setting default filter by column as subject
     ui.filterLineEdit->setCurrentFilter(COLUMN_SUBJECT);
diff --git a/retroshare-gui/src/gui/common/GroupTreeWidget.cpp b/retroshare-gui/src/gui/common/GroupTreeWidget.cpp
index 364e967b9..6af62c591 100644
--- a/retroshare-gui/src/gui/common/GroupTreeWidget.cpp
+++ b/retroshare-gui/src/gui/common/GroupTreeWidget.cpp
@@ -85,8 +85,8 @@ GroupTreeWidget::GroupTreeWidget(QWidget *parent) :
 	header->resizeSection(COLUMN_POPULARITY, 25);
 
 	/* add filter actions */
-	ui->filterLineEdit->addFilter(QIcon(), tr("Title"), FILTER_NAME_INDEX);
-	ui->filterLineEdit->addFilter(QIcon(), tr("Description"), FILTER_DESC_INDEX);
+	ui->filterLineEdit->addFilter(QIcon(), tr("Title"), FILTER_NAME_INDEX , tr("Search Title"));
+	ui->filterLineEdit->addFilter(QIcon(), tr("Description"), FILTER_DESC_INDEX , tr("Search Description"));
 	ui->filterLineEdit->setCurrentFilter(FILTER_NAME_INDEX);
 	// can be removed when the actions of the filter line edit have own placeholder text
 	ui->filterLineEdit->setPlaceholderText(tr("Enter a Keyword here"));
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index 308bd81c9..ccc0c561a 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -80,6 +80,10 @@
         <file>images/channels32.png</file>
         <file>images/channels_new32.png</file>
         <file>images/channels_new.png</file>
+        <file>images/channelsred.png</file>
+        <file>images/channelsyellow.png</file>
+        <file>images/channelsgreen.png</file>
+        <file>images/channelsblue.png</file>
         <file>images/copyrslink.png</file>
         <file>images/contacts24.png</file>
         <file>images/connection.png</file>
diff --git a/retroshare-gui/src/gui/images/channelsblue.png b/retroshare-gui/src/gui/images/channelsblue.png
new file mode 100644
index 000000000..c385de26b
Binary files /dev/null and b/retroshare-gui/src/gui/images/channelsblue.png differ
diff --git a/retroshare-gui/src/gui/images/channelsgreen.png b/retroshare-gui/src/gui/images/channelsgreen.png
new file mode 100644
index 000000000..8649075b3
Binary files /dev/null and b/retroshare-gui/src/gui/images/channelsgreen.png differ
diff --git a/retroshare-gui/src/gui/images/channelsred.png b/retroshare-gui/src/gui/images/channelsred.png
new file mode 100644
index 000000000..5d4e8a35f
Binary files /dev/null and b/retroshare-gui/src/gui/images/channelsred.png differ
diff --git a/retroshare-gui/src/gui/images/channelsyellow.png b/retroshare-gui/src/gui/images/channelsyellow.png
new file mode 100644
index 000000000..f6dab53cf
Binary files /dev/null and b/retroshare-gui/src/gui/images/channelsyellow.png differ