--- a/src/qtgui/rclmain.ui
+++ b/src/qtgui/rclmain.ui
@@ -1,398 +1,369 @@
-<!DOCTYPE UI><UI version="3.3" stdsetdef="1">
-<class>RclMainBase</class>
-<widget class="QMainWindow">
-    <property name="name">
-        <cstring>RclMainBase</cstring>
-    </property>
-    <property name="geometry">
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>RclMainBase</class>
+ <widget class="QMainWindow" name="RclMainBase">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Recoll</string>
+  </property>
+  <widget class="QWidget" name="centralwidget">
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <property name="spacing">
+     <number>2</number>
+    </property>
+    <property name="margin">
+     <number>4</number>
+    </property>
+    <item>
+     <widget class="SSearch" name="sSearch" native="true">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+     </widget>
+    </item>
+    <item>
+     <widget class="QGroupBox" name="catgBGRP">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+        <horstretch>0</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+      <property name="title">
+       <string/>
+      </property>
+      <property name="selectedId" stdset="0">
+       <number>0</number>
+      </property>
+      <widget class="QRadioButton" name="allRDB">
+       <property name="geometry">
         <rect>
-            <x>0</x>
-            <y>0</y>
-            <width>800</width>
-            <height>600</height>
+         <x>0</x>
+         <y>0</y>
+         <width>45</width>
+         <height>29</height>
         </rect>
-    </property>
-    <property name="sizePolicy">
-        <sizepolicy>
-            <hsizetype>5</hsizetype>
-            <vsizetype>5</vsizetype>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-        </sizepolicy>
-    </property>
-    <property name="caption">
-        <string>Recoll</string>
-    </property>
-    <vbox>
-        <property name="name">
-            <cstring>unnamed</cstring>
-        </property>
-        <property name="margin">
-            <number>4</number>
-        </property>
-        <property name="spacing">
-            <number>2</number>
-        </property>
-        <widget class="QLayoutWidget">
-            <property name="name">
-                <cstring>layout4</cstring>
-            </property>
-            <vbox>
-                <property name="name">
-                    <cstring>unnamed</cstring>
-                </property>
-                <property name="margin">
-                    <number>2</number>
-                </property>
-                <property name="spacing">
-                    <number>2</number>
-                </property>
-                <widget class="SSearch">
-                    <property name="name">
-                        <cstring>sSearch</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>7</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                </widget>
-                <widget class="QButtonGroup">
-                    <property name="name">
-                        <cstring>catgBGRP</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>5</hsizetype>
-                            <vsizetype>0</vsizetype>
-                            <horstretch>0</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                    <property name="frameShape">
-                        <enum>GroupBoxPanel</enum>
-                    </property>
-                    <property name="frameShadow">
-                        <enum>Sunken</enum>
-                    </property>
-                    <property name="title">
-                        <string></string>
-                    </property>
-                    <property name="selectedId" stdset="0">
-                        <number>0</number>
-                    </property>
-                    <widget class="QRadioButton">
-                        <property name="name">
-                            <cstring>allRDB</cstring>
-                        </property>
-                        <property name="text">
-                            <string>All</string>
-                        </property>
-                    </widget>
-                </widget>
-                <widget class="ResList">
-                    <property name="name">
-                        <cstring>resList</cstring>
-                    </property>
-                    <property name="sizePolicy">
-                        <sizepolicy>
-                            <hsizetype>5</hsizetype>
-                            <vsizetype>5</vsizetype>
-                            <horstretch>2</horstretch>
-                            <verstretch>0</verstretch>
-                        </sizepolicy>
-                    </property>
-                </widget>
-            </vbox>
-        </widget>
-    </vbox>
-</widget>
-<menubar>
-    <property name="name">
-        <cstring>MenuBar</cstring>
-    </property>
-    <item text="&amp;File" name="fileMenu">
-        <action name="fileToggleIndexingAction"/>
-        <separator/>
-        <action name="fileEraseDocHistoryAction"/>
-        <action name="showMissingHelpers_Action"/>
-        <separator/>
-        <action name="toggleFullScreenAction"/>
-        <separator/>
-        <action name="fileExitAction"/>
+       </property>
+       <property name="text">
+        <string>All</string>
+       </property>
+      </widget>
+     </widget>
     </item>
-    <item text="&amp;Tools" name="toolsMenu">
-        <action name="toolsDoc_HistoryAction"/>
-        <action name="toolsAdvanced_SearchAction"/>
-        <action name="toolsSort_parametersAction"/>
-        <action name="toolsSpellAction"/>
+    <item>
+     <widget class="ResList" name="resList" native="true">
+      <property name="sizePolicy">
+       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+        <horstretch>2</horstretch>
+        <verstretch>0</verstretch>
+       </sizepolicy>
+      </property>
+     </widget>
     </item>
-    <item text="&amp;Preferences" name="preferencesMenu">
-        <action name="indexConfigAction"/>
-        <separator/>
-        <action name="queryPrefsAction"/>
-        <action name="extIdxAction"/>
-        <separator/>
-    </item>
-    <separator/>
-    <item text="&amp;Help" name="helpMenu">
-        <action name="userManualAction"/>
-        <action name="showMissingHelpers_Action"/>
-        <separator/>
-        <action name="helpAbout_RecollAction"/>
-    </item>
-</menubar>
-<toolbars>
-    <toolbar dock="2">
-        <property name="name">
-            <cstring>Toolbar</cstring>
-        </property>
-        <property name="label">
-            <string>Search tools</string>
-        </property>
-        <action name="toolsAdvanced_SearchAction"/>
-        <action name="toolsSort_parametersAction"/>
-        <action name="toolsDoc_HistoryAction"/>
-        <action name="toolsSpellAction"/>
-    </toolbar>
-    <toolbar dock="2">
-        <property name="name">
-            <cstring>Toolbar1</cstring>
-        </property>
-        <property name="label">
-            <string>Result list</string>
-        </property>
-        <action name="firstPageAction"/>
-        <action name="prevPageAction"/>
-        <action name="nextPageAction"/>
-    </toolbar>
-</toolbars>
-<customwidgets>
-    <customwidget>
-        <class>SSearch</class>
-        <header location="local">ssearch_w.h</header>
-        <sizehint>
-            <width>-1</width>
-            <height>-1</height>
-        </sizehint>
-        <container>0</container>
-        <sizepolicy>
-            <hordata>5</hordata>
-            <verdata>5</verdata>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-        </sizepolicy>
-        <signal>startSearch(RefCntr&lt;Rcl::AdvSearchData&gt;)</signal>
-    </customwidget>
-    <customwidget>
-        <class>ResList</class>
-        <header location="local">reslist.h</header>
-        <sizehint>
-            <width>300</width>
-            <height>200</height>
-        </sizehint>
-        <container>0</container>
-        <sizepolicy>
-            <hordata>5</hordata>
-            <verdata>5</verdata>
-            <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
-        </sizepolicy>
-    </customwidget>
-</customwidgets>
-<actions>
-    <action>
-        <property name="name">
-            <cstring>fileExitAction</cstring>
-        </property>
-        <property name="menuText">
-            <string>E&amp;xit</string>
-        </property>
-        <property name="accel">
-            <string>Ctrl+Q</string>
-        </property>
-    </action>
-    <action>
-        <property name="name">
-            <cstring>fileToggleIndexingAction</cstring>
-        </property>
-        <property name="menuText">
-            <string>Update &amp;index</string>
-        </property>
-    </action>
-    <action>
-        <property name="name">
-            <cstring>fileEraseDocHistoryAction</cstring>
-        </property>
-        <property name="menuText">
-            <string>&amp;Erase document history</string>
-        </property>
-    </action>
-    <action>
-        <property name="name">
-            <cstring>showMissingHelpers_Action</cstring>
-        </property>
-        <property name="menuText">
-            <string>&amp;Show missing helpers</string>
-        </property>
-    </action>
-    <action>
-        <property name="name">
-            <cstring>helpAbout_RecollAction</cstring>
-        </property>
-        <property name="menuText">
-            <string>&amp;About Recoll</string>
-        </property>
-    </action>
-    <action>
-        <property name="name">
-            <cstring>userManualAction</cstring>
-        </property>
-        <property name="menuText">
-            <string>&amp;User manual</string>
-        </property>
-    </action>
-    <action>
-        <property name="name">
-            <cstring>toolsDoc_HistoryAction</cstring>
-        </property>
-        <property name="menuText">
-            <string>Document &amp;History</string>
-        </property>
-        <property name="toolTip">
-            <string>Document  History</string>
-        </property>
-    </action>
-    <action>
-        <property name="name">
-            <cstring>toolsAdvanced_SearchAction</cstring>
-        </property>
-        <property name="menuText">
-            <string>&amp;Advanced Search</string>
-        </property>
-        <property name="toolTip">
-            <string>Advanced/complex  Search</string>
-        </property>
-    </action>
-    <action>
-        <property name="name">
-            <cstring>toolsSort_parametersAction</cstring>
-        </property>
-        <property name="menuText">
-            <string>&amp;Sort parameters</string>
-        </property>
-        <property name="toolTip">
-            <string>Sort parameters</string>
-        </property>
-    </action>
-    <action>
-        <property name="name">
-            <cstring>toolsSpellAction</cstring>
-        </property>
-        <property name="menuText">
-            <string>Term &amp;explorer</string>
-        </property>
-        <property name="toolTip">
-            <string>Term explorer tool</string>
-        </property>
-    </action>
-    <action>
-        <property name="name">
-            <cstring>nextPageAction</cstring>
-        </property>
-        <property name="enabled">
-            <bool>false</bool>
-        </property>
-        <property name="text">
-            <string>Next page</string>
-        </property>
-        <property name="toolTip">
-            <string>Next page of results</string>
-        </property>
-        <property name="accel">
-            <string>PgDown</string>
-        </property>
-    </action>
-    <action>
-        <property name="name">
-            <cstring>firstPageAction</cstring>
-        </property>
-        <property name="enabled">
-            <bool>false</bool>
-        </property>
-        <property name="text">
-            <string>First page</string>
-        </property>
-        <property name="toolTip">
-            <string>Go to first page of results</string>
-        </property>
-        <property name="accel">
-            <string>Shift+Home, Ctrl+S, Ctrl+Q, Ctrl+S</string>
-        </property>
-    </action>
-    <action>
-        <property name="name">
-            <cstring>prevPageAction</cstring>
-        </property>
-        <property name="enabled">
-            <bool>false</bool>
-        </property>
-        <property name="text">
-            <string>Previous page</string>
-        </property>
-        <property name="toolTip">
-            <string>Previous page of results</string>
-        </property>
-        <property name="accel">
-            <string>PgUp</string>
-        </property>
-    </action>
-    <action>
-        <property name="name">
-            <cstring>indexConfigAction</cstring>
-        </property>
-        <property name="menuText">
-            <string>&amp;Indexing configuration</string>
-        </property>
-    </action>
-    <action>
-        <property name="name">
-            <cstring>queryPrefsAction</cstring>
-        </property>
-        <property name="menuText">
-            <string>&amp;Query configuration</string>
-        </property>
-    </action>
-    <action>
-        <property name="name">
-            <cstring>extIdxAction</cstring>
-        </property>
-        <property name="text">
-            <string>External index dialog</string>
-        </property>
-        <property name="menuText">
-            <string>External index dialog</string>
-        </property>
-    </action>
-    <action>
-        <property name="name">
-            <cstring>toggleFullScreenAction</cstring>
-        </property>
-        <property name="menuText">
-            <string>&amp;Full Screen</string>
-        </property>
-        <property name="accel">
-            <string>F11</string>
-        </property>
-    </action>
-</actions>
-<pixmapinproject/>
-<layoutdefaults spacing="2" margin="2"/>
-<includehints>
-    <includehint>ssearch_w.h</includehint>
-    <includehint>reslist.h</includehint>
-</includehints>
-</UI>
+   </layout>
+  </widget>
+  <widget class="QStatusBar" name="statusbar"/>
+  <widget class="QToolBar" name="Toolbar">
+   <property name="windowTitle">
+    <string>Search tools</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="toolsAdvanced_SearchAction"/>
+   <addaction name="toolsSort_parametersAction"/>
+   <addaction name="toolsDoc_HistoryAction"/>
+   <addaction name="toolsSpellAction"/>
+  </widget>
+  <widget class="QToolBar" name="Toolbar1">
+   <property name="windowTitle">
+    <string>Result list</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+   <addaction name="firstPageAction"/>
+   <addaction name="prevPageAction"/>
+   <addaction name="nextPageAction"/>
+  </widget>
+  <widget class="QMenuBar" name="MenuBar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>800</width>
+     <height>31</height>
+    </rect>
+   </property>
+   <widget class="QMenu" name="fileMenu">
+    <property name="title">
+     <string>&amp;File</string>
+    </property>
+    <addaction name="fileToggleIndexingAction"/>
+    <addaction name="separator"/>
+    <addaction name="fileEraseDocHistoryAction"/>
+    <addaction name="showMissingHelpers_Action"/>
+    <addaction name="separator"/>
+    <addaction name="toggleFullScreenAction"/>
+    <addaction name="separator"/>
+    <addaction name="fileExitAction"/>
+   </widget>
+   <widget class="QMenu" name="toolsMenu">
+    <property name="title">
+     <string>&amp;Tools</string>
+    </property>
+    <addaction name="toolsDoc_HistoryAction"/>
+    <addaction name="toolsAdvanced_SearchAction"/>
+    <addaction name="toolsSort_parametersAction"/>
+    <addaction name="toolsSpellAction"/>
+   </widget>
+   <widget class="QMenu" name="preferencesMenu">
+    <property name="title">
+     <string>&amp;Preferences</string>
+    </property>
+    <addaction name="indexConfigAction"/>
+    <addaction name="separator"/>
+    <addaction name="queryPrefsAction"/>
+    <addaction name="extIdxAction"/>
+    <addaction name="separator"/>
+   </widget>
+   <widget class="QMenu" name="helpMenu">
+    <property name="title">
+     <string>&amp;Help</string>
+    </property>
+    <addaction name="userManualAction"/>
+    <addaction name="showMissingHelpers_Action"/>
+    <addaction name="separator"/>
+    <addaction name="helpAbout_RecollAction"/>
+   </widget>
+   <addaction name="fileMenu"/>
+   <addaction name="toolsMenu"/>
+   <addaction name="preferencesMenu"/>
+   <addaction name="separator"/>
+   <addaction name="helpMenu"/>
+  </widget>
+  <action name="fileExitAction">
+   <property name="text">
+    <string>E&amp;xit</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Q</string>
+   </property>
+   <property name="name" stdset="0">
+    <cstring>fileExitAction</cstring>
+   </property>
+  </action>
+  <action name="fileToggleIndexingAction">
+   <property name="text">
+    <string>Update &amp;index</string>
+   </property>
+   <property name="name" stdset="0">
+    <cstring>fileToggleIndexingAction</cstring>
+   </property>
+  </action>
+  <action name="fileEraseDocHistoryAction">
+   <property name="text">
+    <string>&amp;Erase document history</string>
+   </property>
+   <property name="name" stdset="0">
+    <cstring>fileEraseDocHistoryAction</cstring>
+   </property>
+  </action>
+  <action name="showMissingHelpers_Action">
+   <property name="text">
+    <string>&amp;Show missing helpers</string>
+   </property>
+   <property name="name" stdset="0">
+    <cstring>showMissingHelpers_Action</cstring>
+   </property>
+  </action>
+  <action name="helpAbout_RecollAction">
+   <property name="text">
+    <string>&amp;About Recoll</string>
+   </property>
+   <property name="name" stdset="0">
+    <cstring>helpAbout_RecollAction</cstring>
+   </property>
+  </action>
+  <action name="userManualAction">
+   <property name="text">
+    <string>&amp;User manual</string>
+   </property>
+   <property name="name" stdset="0">
+    <cstring>userManualAction</cstring>
+   </property>
+  </action>
+  <action name="toolsDoc_HistoryAction">
+   <property name="text">
+    <string>Document &amp;History</string>
+   </property>
+   <property name="toolTip">
+    <string>Document  History</string>
+   </property>
+   <property name="name" stdset="0">
+    <cstring>toolsDoc_HistoryAction</cstring>
+   </property>
+  </action>
+  <action name="toolsAdvanced_SearchAction">
+   <property name="text">
+    <string>&amp;Advanced Search</string>
+   </property>
+   <property name="toolTip">
+    <string>Advanced/complex  Search</string>
+   </property>
+   <property name="name" stdset="0">
+    <cstring>toolsAdvanced_SearchAction</cstring>
+   </property>
+  </action>
+  <action name="toolsSort_parametersAction">
+   <property name="text">
+    <string>&amp;Sort parameters</string>
+   </property>
+   <property name="toolTip">
+    <string>Sort parameters</string>
+   </property>
+   <property name="name" stdset="0">
+    <cstring>toolsSort_parametersAction</cstring>
+   </property>
+  </action>
+  <action name="toolsSpellAction">
+   <property name="text">
+    <string>Term &amp;explorer</string>
+   </property>
+   <property name="toolTip">
+    <string>Term explorer tool</string>
+   </property>
+   <property name="name" stdset="0">
+    <cstring>toolsSpellAction</cstring>
+   </property>
+  </action>
+  <action name="nextPageAction">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="iconText">
+    <string>Next page</string>
+   </property>
+   <property name="toolTip">
+    <string>Next page of results</string>
+   </property>
+   <property name="shortcut">
+    <string>PgDown</string>
+   </property>
+   <property name="name" stdset="0">
+    <cstring>nextPageAction</cstring>
+   </property>
+  </action>
+  <action name="firstPageAction">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="iconText">
+    <string>First page</string>
+   </property>
+   <property name="toolTip">
+    <string>Go to first page of results</string>
+   </property>
+   <property name="shortcut">
+    <string>Shift+Home</string>
+   </property>
+   <property name="name" stdset="0">
+    <cstring>firstPageAction</cstring>
+   </property>
+  </action>
+  <action name="prevPageAction">
+   <property name="enabled">
+    <bool>false</bool>
+   </property>
+   <property name="iconText">
+    <string>Previous page</string>
+   </property>
+   <property name="toolTip">
+    <string>Previous page of results</string>
+   </property>
+   <property name="shortcut">
+    <string>PgUp</string>
+   </property>
+   <property name="name" stdset="0">
+    <cstring>prevPageAction</cstring>
+   </property>
+  </action>
+  <action name="indexConfigAction">
+   <property name="text">
+    <string>&amp;Indexing configuration</string>
+   </property>
+   <property name="name" stdset="0">
+    <cstring>indexConfigAction</cstring>
+   </property>
+  </action>
+  <action name="queryPrefsAction">
+   <property name="text">
+    <string>&amp;Query configuration</string>
+   </property>
+   <property name="name" stdset="0">
+    <cstring>queryPrefsAction</cstring>
+   </property>
+  </action>
+  <action name="extIdxAction">
+   <property name="text">
+    <string>External index dialog</string>
+   </property>
+   <property name="iconText">
+    <string>External index dialog</string>
+   </property>
+   <property name="name" stdset="0">
+    <cstring>extIdxAction</cstring>
+   </property>
+  </action>
+  <action name="toggleFullScreenAction">
+   <property name="text">
+    <string>&amp;Full Screen</string>
+   </property>
+   <property name="iconText">
+    <string>Full Screen</string>
+   </property>
+   <property name="shortcut">
+    <string>F11</string>
+   </property>
+   <property name="name" stdset="0">
+    <cstring>toggleFullScreenAction</cstring>
+   </property>
+  </action>
+ </widget>
+ <layoutdefault spacing="2" margin="2"/>
+ <pixmapfunction>qPixmapFromMimeSource</pixmapfunction>
+ <customwidgets>
+  <customwidget>
+   <class>SSearch</class>
+   <extends>QWidget</extends>
+   <header>ssearch_w.h</header>
+  </customwidget>
+  <customwidget>
+   <class>ResList</class>
+   <extends>QWidget</extends>
+   <header>reslist.h</header>
+  </customwidget>
+ </customwidgets>
+ <includes>
+  <include location="local">ssearch_w.h</include>
+  <include location="local">reslist.h</include>
+ </includes>
+ <resources/>
+ <connections/>
+</ui>