diff --git a/retroshare-gui/src/gui/SearchDialog.ui b/retroshare-gui/src/gui/SearchDialog.ui
index 13a4c0e72..59ae2c3a3 100644
--- a/retroshare-gui/src/gui/SearchDialog.ui
+++ b/retroshare-gui/src/gui/SearchDialog.ui
@@ -526,13 +526,13 @@ border: 1px solid #CCCCCC;}</string>
      </property>
      <layout class="QGridLayout" name="gridLayout_3">
       <property name="leftMargin">
-       <number>2</number>
+       <number>3</number>
       </property>
       <property name="topMargin">
        <number>0</number>
       </property>
       <property name="rightMargin">
-       <number>2</number>
+       <number>3</number>
       </property>
       <property name="bottomMargin">
        <number>0</number>
@@ -543,41 +543,7 @@ border: 1px solid #CCCCCC;}</string>
       <property name="verticalSpacing">
        <number>0</number>
       </property>
-      <item row="0" column="0">
-       <widget class="QLabel" name="label">
-        <property name="maximumSize">
-         <size>
-          <width>22</width>
-          <height>22</height>
-         </size>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-        <property name="pixmap">
-         <pixmap resource="images.qrc">:/images/filefind.png</pixmap>
-        </property>
-        <property name="scaledContents">
-         <bool>true</bool>
-        </property>
-       </widget>
-      </item>
       <item row="0" column="1">
-       <widget class="QLabel" name="label_2">
-        <property name="font">
-         <font>
-          <family>Arial</family>
-          <pointsize>10</pointsize>
-          <weight>75</weight>
-          <bold>true</bold>
-         </font>
-        </property>
-        <property name="text">
-         <string>Search</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
        <widget class="QComboBox" name="FileTypeComboBox">
         <property name="styleSheet">
          <string notr="true">QToolButton, QPushButton, QComboBox { 
@@ -704,7 +670,7 @@ border-image: url(:/images/btn_26_pressed.png) 4;
         </item>
        </widget>
       </item>
-      <item row="0" column="3">
+      <item row="0" column="2">
        <spacer>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -720,7 +686,7 @@ border-image: url(:/images/btn_26_pressed.png) 4;
         </property>
        </spacer>
       </item>
-      <item row="0" column="4">
+      <item row="0" column="3">
        <layout class="QHBoxLayout" name="horizontalLayout">
         <property name="spacing">
          <number>0</number>
@@ -744,10 +710,16 @@ background: white;</string>
            <enum>QFrame::Raised</enum>
           </property>
           <layout class="QGridLayout" name="gridLayout">
+           <property name="horizontalSpacing">
+            <number>0</number>
+           </property>
+           <property name="verticalSpacing">
+            <number>1</number>
+           </property>
            <property name="margin">
             <number>0</number>
            </property>
-           <item row="0" column="0">
+           <item row="0" column="1">
             <widget class="QLineEdit" name="lineEdit">
              <property name="sizePolicy">
               <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
@@ -781,7 +753,7 @@ border: none;}
              </property>
             </widget>
            </item>
-           <item row="0" column="1">
+           <item row="0" column="2">
             <widget class="QPushButton" name="resetButton">
              <property name="minimumSize">
               <size>
@@ -818,6 +790,39 @@ border-image: url(:/images/closepressed.png)
              </property>
             </widget>
            </item>
+           <item row="0" column="0">
+            <widget class="QPushButton" name="pushButton">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>16</width>
+               <height>16</height>
+              </size>
+             </property>
+             <property name="styleSheet">
+              <string notr="true">QPushButton#pushButton{background: transparent;
+border: none;}</string>
+             </property>
+             <property name="text">
+              <string/>
+             </property>
+             <property name="icon">
+              <iconset resource="images.qrc">
+               <normaloff>:/images/find-16.png</normaloff>:/images/find-16.png</iconset>
+             </property>
+             <property name="iconSize">
+              <size>
+               <width>16</width>
+               <height>16</height>
+              </size>
+             </property>
+            </widget>
+           </item>
           </layout>
          </widget>
         </item>
@@ -853,7 +858,7 @@ border-image: url(:/images/btn3.png) 4;
         </item>
        </layout>
       </item>
-      <item row="0" column="5">
+      <item row="0" column="4">
        <spacer>
         <property name="orientation">
          <enum>Qt::Horizontal</enum>
@@ -869,7 +874,7 @@ border-image: url(:/images/btn3.png) 4;
         </property>
        </spacer>
       </item>
-      <item row="0" column="6">
+      <item row="0" column="5">
        <widget class="QPushButton" name="toggleAdvancedSearchBtn">
         <property name="toolTip">
          <string>Advanced Search</string>
diff --git a/retroshare-gui/src/gui/images.qrc b/retroshare-gui/src/gui/images.qrc
index a3a1d6b9d..b44001d7c 100644
--- a/retroshare-gui/src/gui/images.qrc
+++ b/retroshare-gui/src/gui/images.qrc
@@ -151,6 +151,7 @@
         <file>images/fileshare24.png</file>
         <file>images/fileshare48.png</file>
         <file>images/find.png</file>
+        <file>images/find-16.png</file>
         <file>images/emoticons/kopete/kopete020.png</file>
         <file>images/flags/af.png</file>
         <file>images/flags/cn.png</file>
diff --git a/retroshare-gui/src/gui/images/find-16.png b/retroshare-gui/src/gui/images/find-16.png
new file mode 100644
index 000000000..81cfa5ef8
Binary files /dev/null and b/retroshare-gui/src/gui/images/find-16.png differ