diff --git a/retroshare-gui/src/gui/ForumsDialog.ui b/retroshare-gui/src/gui/ForumsDialog.ui
index 12ba0d555..c5a23614e 100644
--- a/retroshare-gui/src/gui/ForumsDialog.ui
+++ b/retroshare-gui/src/gui/ForumsDialog.ui
@@ -538,7 +538,7 @@
               <enum>Qt::Horizontal</enum>
              </property>
              <property name="sizeType">
-              <enum>QSizePolicy::Fixed</enum>
+              <enum>QSizePolicy::Expanding</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
@@ -553,16 +553,6 @@
              <property name="spacing">
               <number>2</number>
              </property>
-             <item>
-              <widget class="QLabel" name="label_3">
-               <property name="text">
-                <string/>
-               </property>
-               <property name="pixmap">
-                <pixmap resource="images.qrc">:/images/find-16.png</pixmap>
-               </property>
-              </widget>
-             </item>
              <item>
               <widget class="LineEditClear" name="filterLineEdit">
                <property name="toolTip">
@@ -581,8 +571,7 @@
               </size>
              </property>
              <property name="font">
-              <font>
-              </font>
+              <font/>
              </property>
              <property name="currentIndex">
               <number>1</number>
diff --git a/retroshare-gui/src/gui/MessagesDialog.ui b/retroshare-gui/src/gui/MessagesDialog.ui
index 1fbb36c6a..3fccd7f11 100644
--- a/retroshare-gui/src/gui/MessagesDialog.ui
+++ b/retroshare-gui/src/gui/MessagesDialog.ui
@@ -372,16 +372,6 @@
         <property name="spacing">
          <number>1</number>
         </property>
-        <item>
-         <widget class="QLabel" name="label">
-          <property name="text">
-           <string/>
-          </property>
-          <property name="pixmap">
-           <pixmap resource="images.qrc">:/images/find-16.png</pixmap>
-          </property>
-         </widget>
-        </item>
         <item>
          <widget class="LineEditClear" name="filterLineEdit"/>
         </item>
diff --git a/retroshare-gui/src/gui/NetworkDialog.ui b/retroshare-gui/src/gui/NetworkDialog.ui
index 4e67c5232..b223be7f2 100644
--- a/retroshare-gui/src/gui/NetworkDialog.ui
+++ b/retroshare-gui/src/gui/NetworkDialog.ui
@@ -175,16 +175,6 @@
             <property name="spacing">
              <number>2</number>
             </property>
-            <item>
-             <widget class="QLabel" name="label_3">
-              <property name="text">
-               <string/>
-              </property>
-              <property name="pixmap">
-               <pixmap resource="images.qrc">:/images/find-16.png</pixmap>
-              </property>
-             </widget>
-            </item>
             <item>
              <widget class="LineEditClear" name="filterLineEdit">
               <property name="toolTip">
@@ -203,8 +193,7 @@
              </size>
             </property>
             <property name="font">
-             <font>
-             </font>
+             <font/>
             </property>
             <property name="currentIndex">
              <number>0</number>
diff --git a/retroshare-gui/src/gui/SearchDialog.ui b/retroshare-gui/src/gui/SearchDialog.ui
index 96ca478e6..132b2e71c 100644
--- a/retroshare-gui/src/gui/SearchDialog.ui
+++ b/retroshare-gui/src/gui/SearchDialog.ui
@@ -172,31 +172,6 @@
             <number>0</number>
            </property>
            <item row="0" column="0">
-            <widget class="QLabel" name="searchLabel">
-             <property name="sizePolicy">
-              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-               <horstretch>0</horstretch>
-               <verstretch>0</verstretch>
-              </sizepolicy>
-             </property>
-             <property name="minimumSize">
-              <size>
-               <width>16</width>
-               <height>16</height>
-              </size>
-             </property>
-             <property name="maximumSize">
-              <size>
-               <width>16</width>
-               <height>16</height>
-              </size>
-             </property>
-             <property name="pixmap">
-              <pixmap resource="images.qrc">:/images/find-16.png</pixmap>
-             </property>
-            </widget>
-           </item>
-           <item row="0" column="1">
             <widget class="LineEditClear" name="lineEdit">
              <property name="toolTip">
               <string>Enter a keyword here (at least 3 char long)</string>
@@ -319,13 +294,6 @@
            <property name="spacing">
             <number>2</number>
            </property>
-           <item>
-            <widget class="QLabel" name="label_3">
-             <property name="pixmap">
-              <pixmap resource="images.qrc">:/images/find-16.png</pixmap>
-             </property>
-            </widget>
-           </item>
            <item>
             <widget class="LineEditClear" name="filterLineEdit">
              <property name="toolTip">
diff --git a/retroshare-gui/src/gui/common/LineEditClear.cpp b/retroshare-gui/src/gui/common/LineEditClear.cpp
index da0211827..f639fd47e 100644
--- a/retroshare-gui/src/gui/common/LineEditClear.cpp
+++ b/retroshare-gui/src/gui/common/LineEditClear.cpp
@@ -28,6 +28,13 @@
 LineEditClear::LineEditClear(QWidget *parent)
 	: QLineEdit(parent)
 {
+	findButton = new QToolButton(this);
+	QPixmap findPixmap(":/images/find-16.png");
+	findButton->setIcon(QIcon(findPixmap));
+	findButton->setIconSize(findPixmap.size());
+	findButton->setCursor(Qt::ArrowCursor);
+	findButton->setStyleSheet("QToolButton { border: none; padding: 0px; }");
+
 	clearButton = new QToolButton(this);
 	clearButton->setFixedSize(16, 16);
 	clearButton->setIconSize(QSize(16, 16));
@@ -42,7 +49,9 @@ LineEditClear::LineEditClear(QWidget *parent)
 	connect(this, SIGNAL(textChanged(const QString&)), this, SLOT(updateCloseButton(const QString&)));
 
 	int frameWidth = style()->pixelMetric(QStyle::PM_DefaultFrameWidth);
-	setStyleSheet(QString("QLineEdit { padding-right: %1px; } ").arg(clearButton->sizeHint().width() + frameWidth + 1));
+	setStyleSheet(QString("QLineEdit { padding-right: %1px; padding-left: %2px; } ").
+			arg(clearButton->sizeHint().width() + frameWidth + 1).
+			arg(findButton->sizeHint().width() + frameWidth + 1));
 	QSize msz = minimumSizeHint();
 	setMinimumSize(qMax(msz.width(), clearButton->sizeHint().height() + frameWidth * 2), qMax(msz.height(), clearButton->sizeHint().height() + frameWidth * 2));
 }
diff --git a/retroshare-gui/src/gui/common/LineEditClear.h b/retroshare-gui/src/gui/common/LineEditClear.h
index 4e790a129..1abb76bfa 100644
--- a/retroshare-gui/src/gui/common/LineEditClear.h
+++ b/retroshare-gui/src/gui/common/LineEditClear.h
@@ -42,6 +42,7 @@ private slots:
 
 private:
 	QToolButton *clearButton;
+	QToolButton *findButton;
 };
 
 #endif // LINEEDITCLEAR_H