diff --git a/src/frontends/qt4/ui/TocUi.ui b/src/frontends/qt4/ui/TocUi.ui
index dd8a7f8ee0..0d7e5732e3 100644
--- a/src/frontends/qt4/ui/TocUi.ui
+++ b/src/frontends/qt4/ui/TocUi.ui
@@ -15,11 +15,19 @@
   <property name="windowTitle" >
    <string/>
   </property>
-  <layout class="QGridLayout" name="gridLayout" >
+  <layout class="QGridLayout" >
+   <property name="margin" >
+    <number>9</number>
+   </property>
+   <property name="spacing" >
+    <number>6</number>
+   </property>
    <item row="0" column="0" colspan="2" >
     <widget class="QComboBox" name="typeCO" >
      <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Ignored" >
+      <sizepolicy>
+       <hsizetype>0</hsizetype>
+       <vsizetype>0</vsizetype>
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -44,7 +52,9 @@
    <item row="2" column="0" >
     <widget class="QSlider" name="depthSL" >
      <property name="sizePolicy" >
-      <sizepolicy vsizetype="Fixed" hsizetype="Expanding" >
+      <sizepolicy>
+       <hsizetype>0</hsizetype>
+       <vsizetype>0</vsizetype>
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
@@ -70,20 +80,22 @@
     </widget>
    </item>
    <item row="2" column="1" >
-    <layout class="QVBoxLayout" name="_2" >
+    <layout class="QVBoxLayout" >
+     <property name="margin" >
+      <number>0</number>
+     </property>
      <property name="spacing" >
       <number>0</number>
      </property>
      <property name="sizeConstraint" >
       <enum>QLayout::SetMinimumSize</enum>
      </property>
-     <property name="leftMargin" >
-      <number>4</number>
-     </property>
      <item>
       <widget class="QCheckBox" name="sortCB" >
        <property name="sizePolicy" >
-        <sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
+        <sizepolicy>
+         <hsizetype>0</hsizetype>
+         <vsizetype>0</vsizetype>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -102,7 +114,9 @@
      <item>
       <widget class="QCheckBox" name="persistentCB" >
        <property name="sizePolicy" >
-        <sizepolicy vsizetype="Minimum" hsizetype="Fixed" >
+        <sizepolicy>
+         <hsizetype>0</hsizetype>
+         <vsizetype>0</vsizetype>
          <horstretch>0</horstretch>
          <verstretch>0</verstretch>
         </sizepolicy>
@@ -125,12 +139,12 @@
    </item>
    <item row="3" column="0" colspan="2" >
     <layout class="QHBoxLayout" >
-     <property name="spacing" >
-      <number>6</number>
-     </property>
      <property name="margin" >
       <number>0</number>
      </property>
+     <property name="spacing" >
+      <number>6</number>
+     </property>
      <item>
       <widget class="QToolButton" name="updateTB" >
        <property name="toolTip" >
@@ -140,8 +154,7 @@
         <string>...</string>
        </property>
        <property name="icon" >
-        <iconset>
-         <normaloff>../../../../lib/images/reload.png</normaloff>../../../../lib/images/reload.png</iconset>
+        <iconset>../../../../lib/images/reload.png</iconset>
        </property>
        <property name="iconSize" >
         <size>
@@ -156,7 +169,7 @@
        <property name="orientation" >
         <enum>Qt::Horizontal</enum>
        </property>
-       <property name="sizeHint" stdset="0" >
+       <property name="sizeHint" >
         <size>
          <width>16</width>
          <height>20</height>
@@ -173,8 +186,7 @@
         <string>...</string>
        </property>
        <property name="icon" >
-        <iconset>
-         <normaloff>../../../../lib/images/promote.png</normaloff>../../../../lib/images/promote.png</iconset>
+        <iconset>../../../../lib/images/promote.png</iconset>
        </property>
        <property name="iconSize" >
         <size>
@@ -193,8 +205,7 @@
         <string>...</string>
        </property>
        <property name="icon" >
-        <iconset>
-         <normaloff>../../../../lib/images/demote.png</normaloff>../../../../lib/images/demote.png</iconset>
+        <iconset>../../../../lib/images/demote.png</iconset>
        </property>
        <property name="iconSize" >
         <size>
@@ -213,8 +224,7 @@
         <string>...</string>
        </property>
        <property name="icon" >
-        <iconset>
-         <normaloff>../../../../lib/images/down.png</normaloff>../../../../lib/images/down.png</iconset>
+        <iconset>../../../../lib/images/down.png</iconset>
        </property>
        <property name="iconSize" >
         <size>
@@ -233,8 +243,7 @@
         <string>...</string>
        </property>
        <property name="icon" >
-        <iconset>
-         <normaloff>../../../../lib/images/up.png</normaloff>../../../../lib/images/up.png</iconset>
+        <iconset>../../../../lib/images/up.png</iconset>
        </property>
        <property name="iconSize" >
         <size>